diff options
author | Jiyong Park | 2017-05-10 12:26:55 -0500 |
---|---|---|
committer | Jiyong Park | 2017-05-14 21:35:34 -0500 |
commit | 15d7483bb77158b5fe631454208cfb2e130572f7 (patch) | |
tree | 9bc95dd9ebd0e400476d9a95e5eea70d78b3239c | |
parent | abaab6ff03c61e73e52fac515a76f1afe13e97ac (diff) | |
download | platform-system-core-15d7483bb77158b5fe631454208cfb2e130572f7.tar.gz platform-system-core-15d7483bb77158b5fe631454208cfb2e130572f7.tar.xz platform-system-core-15d7483bb77158b5fe631454208cfb2e130572f7.zip |
add libvndksupport.so to ll-ndk
libvndksupport.so is a new member of ll-ndk.
Bug: 37323945
Test: sailfish builds and boots
Merged-In: Ic5db48292a30a6face7f263d939f27a0760240b1
Change-Id: Ic5db48292a30a6face7f263d939f27a0760240b1
(cherry picked from commit 7000859b7cb0b0947d11f9fbe4ffddb6f66cabc4)
-rw-r--r-- | rootdir/etc/ld.config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index ffa12599f..b4adf53f7 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt | |||
@@ -60,7 +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 | 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 | 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:libvndksupport.so |
64 | 64 | ||
65 | # 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. |
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 | 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 |
@@ -81,7 +81,7 @@ namespace.rs.search.paths = /system/${LIB}/vndk-sp:/vendor/${LIB} | |||
81 | namespace.rs.permitted.paths = /vendor/${LIB}:/data | 81 | namespace.rs.permitted.paths = /vendor/${LIB}:/data |
82 | 82 | ||
83 | namespace.rs.links = default,vndk | 83 | namespace.rs.links = default,vndk |
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 | 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:libvndksupport.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 | 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 |
86 | 86 | ||
87 | ############################################################################### | 87 | ############################################################################### |
@@ -100,7 +100,7 @@ namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB} | |||
100 | # 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 |
101 | # Android releases. | 101 | # Android releases. |
102 | namespace.vndk.links = default | 102 | namespace.vndk.links = default |
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 | 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:libvndksupport.so |
104 | 104 | ||
105 | 105 | ||
106 | [vendor] | 106 | [vendor] |