From b5ddc5ae6b16cb58e4cb49c923ae7cdcec4f9ab6 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Fri, 25 Aug 2017 12:30:44 +0900 Subject: [PATCH] vndk: add vendor/lib(64)/vndk for vendor namespace When the vndk is extended by vendor, the libs in vendor/lib(64)/vndk will override system/lib(64)/vndk libs. Vendor binaries will search vndk libs in vendor/lib(64)/vndk prior to system/lib(64)/vndk. Also, remove a workaround for libsdm-color.so Bug: 65032513 Test: build and boot check for libsdm-color.so will be loaded on boot Test: currently no libs exist on vendor/lib(64)/vndk. No test for it Merged-In: I99ed37eb1a9e92c83533e2d92c9c06db11f01e97 Change-Id: I99ed37eb1a9e92c83533e2d92c9c06db11f01e97 (cherry picked from commit 3094de968443c60345f63318f14a5d919df762d5) --- rootdir/etc/ld.config.vndk.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rootdir/etc/ld.config.vndk.txt b/rootdir/etc/ld.config.vndk.txt index c7e257344..063aab923 100644 --- a/rootdir/etc/ld.config.vndk.txt +++ b/rootdir/etc/ld.config.vndk.txt @@ -132,15 +132,14 @@ additional.namespaces = system namespace.default.isolated = true namespace.default.visible = true -namespace.default.search.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/system/${LIB}/vndk:/vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp +namespace.default.search.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/vendor/${LIB}/vndk:/system/${LIB}/vndk:/vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp namespace.default.permitted.paths = /vendor:/system/${LIB}/vndk:/system/${LIB}/vndk-sp -namespace.default.asan.search.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/system/${LIB}/vndk:/system/${LIB}/vndk:/data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp +namespace.default.asan.search.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/vendor/${LIB}/vndk:/vendor/${LIB}/vndk:/data/asan/system/${LIB}/vndk:/system/${LIB}/vndk:/data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp namespace.default.asan.permitted.paths = /data/asan/vendor:/vendor:/data/asan/system/${LIB}/vndk:/system/${LIB}/vndk:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp namespace.default.links = system -namespace.default.link.system.shared_libs = libEGL.so:libm.so:libandroid_net.so:libvndksupport.so:libc.so:libGLESv1_CM.so:liblog.so:libsync.so:libnativewindow.so:libGLESv3.so:libdl.so:libGLESv2.so:libpowermanager.so:libmedia.so:libandroid_runtime.so -# libpowermanager.so must be removed after we have fix for libsdm-color.so (b/64732165) +namespace.default.link.system.shared_libs = libEGL.so:libm.so:libandroid_net.so:libvndksupport.so:libc.so:libGLESv1_CM.so:liblog.so:libsync.so:libnativewindow.so:libGLESv3.so:libdl.so:libGLESv2.so:libmedia.so:libandroid_runtime.so # libmedia.so must be removed after we have fix for lib-dplmedia.so (b/64427765) # libandroid_runtime.so must be removed after we have a fix for qseeproxydaemon (b/64820887)