From 91b3fb4f3f172d1c314415d7b05873872951e08c Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 11 Jan 2018 20:00:37 +0800 Subject: [PATCH] ld.config.txt: Move vendor vndk to vndk namespace This commit moves /{odm,vendor}/lib[64]/vndk[-sp] to vndk namespace so that vndk extension can override vndk libs from /system/lib[64]/vndk[-sp]. Bug: 69824336 Test: Create libutils_ext locally and it can be called from android.hardware.nfc@1.0-service. Change-Id: Id63e58d665fa41eda85950ee1d16fe06c35cd7d3 --- rootdir/etc/ld.config.txt.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rootdir/etc/ld.config.txt.in b/rootdir/etc/ld.config.txt.in index cad09c3ff..2a801fad8 100644 --- a/rootdir/etc/ld.config.txt.in +++ b/rootdir/etc/ld.config.txt.in @@ -234,27 +234,15 @@ namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /odm/${LIB} -namespace.default.search.paths += /odm/${LIB}/vndk -namespace.default.search.paths += /odm/${LIB}/vndk-sp namespace.default.search.paths += /vendor/${LIB} -namespace.default.search.paths += /vendor/${LIB}/vndk -namespace.default.search.paths += /vendor/${LIB}/vndk-sp namespace.default.permitted.paths = /odm namespace.default.permitted.paths += /vendor namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk -namespace.default.asan.search.paths += /odm/${LIB}/vndk -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp -namespace.default.asan.search.paths += /odm/${LIB}/vndk-sp namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk -namespace.default.asan.search.paths += /vendor/${LIB}/vndk -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp -namespace.default.asan.search.paths += /vendor/${LIB}/vndk-sp namespace.default.asan.permitted.paths = /data/asan/odm namespace.default.asan.permitted.paths += /odm @@ -274,10 +262,22 @@ namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES% ############################################################################### namespace.vndk.isolated = false -namespace.vndk.search.paths = /system/${LIB}/vndk-sp%VNDK_VER% +namespace.vndk.search.paths = /odm/${LIB}/vndk +namespace.vndk.search.paths += /odm/${LIB}/vndk-sp +namespace.vndk.search.paths += /vendor/${LIB}/vndk +namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp +namespace.vndk.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.vndk.search.paths += /system/${LIB}/vndk%VNDK_VER% -namespace.vndk.asan.search.paths = /data/asan/system/${LIB}/vndk-sp%VNDK_VER% +namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk +namespace.vndk.asan.search.paths += /odm/${LIB}/vndk +namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp +namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp +namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk +namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk +namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp +namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp +namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER% namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER% namespace.vndk.asan.search.paths += /system/${LIB}/vndk%VNDK_VER%