From 023ff46e18f8a10fb13822844dc4b493da88a40e Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Tue, 12 Feb 2019 16:23:12 +0900 Subject: [PATCH] Change search order for vendor processes in vndk_lite. Originally, vndk_lite does not include system/lib/vndk-* directory but searching the required files in system/lib instead. However, in GSI, they are using the vndk libs which has symbols than core variants. To avoid this problem, allow the vendor processes in vndk_lite devices to search system/lib prior to vndk libs. Bug: 124063441 Test: Check boot for vndk_lite devices. Change-Id: I89a72e9d43d6fb05f4b6d87bbd4500f8febfe970 --- rootdir/etc/ld.config.vndk_lite.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 95195b59a..23b4e7d03 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -306,11 +306,11 @@ namespace.default.search.paths += /vendor/${LIB}/vndk namespace.default.search.paths += /vendor/${LIB}/vndk-sp # Access to system libraries is allowed -namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.default.search.paths += /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} +namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} @@ -324,8 +324,6 @@ 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.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER% -namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER% namespace.default.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.default.asan.search.paths += /data/asan/system/${LIB} @@ -334,6 +332,8 @@ namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} namespace.default.asan.search.paths += /data/asan/product_services/${LIB} namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} +namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER% +namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.links = runtime namespace.default.link.runtime.shared_libs = libdexfile_external.so