diff options
author | Jiyong Park | 2017-04-25 00:05:39 -0500 |
---|---|---|
committer | Jiyong Park | 2017-05-14 21:35:34 -0500 |
commit | abaab6ff03c61e73e52fac515a76f1afe13e97ac (patch) | |
tree | e0feff96bf0114d2161ac4e64a1027a762a6d78d | |
parent | 8902f7571adb68147f6641cb44beb5186c53dc44 (diff) | |
download | platform-system-core-abaab6ff03c61e73e52fac515a76f1afe13e97ac.tar.gz platform-system-core-abaab6ff03c61e73e52fac515a76f1afe13e97ac.tar.xz platform-system-core-abaab6ff03c61e73e52fac515a76f1afe13e97ac.zip |
libbacktrace is VNDK-SP
libbacktrace and its dependents are now VNDK-SP. Since they are in
/vendor/lib/vndk-sp directory, they are accessible directly from the
vndk namespace. Therefore, libbacktrace is removed from the exported
shared libs list of the default namespace.
Bug: 37413104
Test: sailfish builds and boots
Merged-In: I137c17d55940b783eab6d0125bc4d26b96bcc2f2
Change-Id: I137c17d55940b783eab6d0125bc4d26b96bcc2f2
(cherry picked from commit b2a4b8cd18e5f45571b8e929088047b445b6f63b)
-rw-r--r-- | rootdir/etc/ld.config.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index e8a34bf3b..ffa12599f 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt | |||
@@ -60,11 +60,7 @@ namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB} | |||
60 | namespace.sphal.links = default,vndk,rs | 60 | namespace.sphal.links = default,vndk,rs |
61 | 61 | ||
62 | # WARNING: only NDK libs can be listed here. | 62 | # WARNING: only NDK libs can be listed here. |
63 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) | 63 | namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so |
64 | # are currently using some non-stable libs such as libbacktrace.so. We will get back | ||
65 | # to this list once the dependencies are fixed. | ||
66 | #namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so | ||
67 | namespace.sphal.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libbacktrace.so:libGLESv1_CM.so:libGLESv2.so | ||
68 | 64 | ||
69 | # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. | 65 | # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. |
70 | namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so | 66 | namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so |
@@ -85,7 +81,7 @@ namespace.rs.search.paths = /system/${LIB}/vndk-sp:/vendor/${LIB} | |||
85 | namespace.rs.permitted.paths = /vendor/${LIB}:/data | 81 | namespace.rs.permitted.paths = /vendor/${LIB}:/data |
86 | 82 | ||
87 | namespace.rs.links = default,vndk | 83 | namespace.rs.links = default,vndk |
88 | namespace.rs.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libbacktrace.so:libGLESv1_CM.so:libGLESv2.so:libmediandk.so:libui.so | 84 | namespace.rs.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so:libmediandk.so:libui.so |
89 | namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so | 85 | namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.base@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidltransport.so:libutils.so:libc++.so |
90 | 86 | ||
91 | ############################################################################### | 87 | ############################################################################### |
@@ -104,13 +100,7 @@ namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB} | |||
104 | # to the default namespace. This is possible since their ABI is stable across | 100 | # to the default namespace. This is possible since their ABI is stable across |
105 | # Android releases. | 101 | # Android releases. |
106 | namespace.vndk.links = default | 102 | namespace.vndk.links = default |
107 | 103 | namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so | |
108 | # WARNING: only NDK libs can be listed here. | ||
109 | # However, this is commented out because some SP-HALs (gralloc.msm8996.so, etc) | ||
110 | # are currently using some non-stable libs such as libbacktrace.so. We will get back | ||
111 | # to this list once the dependencies are fixed. | ||
112 | #namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libsync.so | ||
113 | namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libbacktrace.so | ||
114 | 104 | ||
115 | 105 | ||
116 | [vendor] | 106 | [vendor] |