commit d9f7389afaa4d4a3332e8c59787d30e9213881e9
author Jooyung Han <jooyung@google.com> Tue Oct 15 10:36:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 15 10:36:05 2019 -0700
tree 6eb0fb003f9814f25990b72c5458abe03bb6bd2d
parent b370033f30f3d23ae5808dc2bb337e08b2039fca
parent 07bd8e774093b73e225562bbd5095a1732246477

Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905
am: 07bd8e7740

Change-Id: I14959ba0e2c76e83bb69d4bf64bc05494fef3540

apex/ld.config.txt

diff --git a/apex/ld.config.txt b/apex/ld.config.txt
index af8ec06..c556b95 100644
--- a/apex/ld.config.txt
+++ b/apex/ld.config.txt
@@ -90,7 +90,7 @@
 
 namespace.sphal.search.paths += /odm/${LIB}/vndk-sp
 namespace.sphal.search.paths += /vendor/${LIB}/vndk-sp
-namespace.sphal.search.paths += /system/${LIB}/vndk-sp${VNDK_VER}
+namespace.sphal.search.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}
 
 namespace.sphal.permitted.paths += /odm/${LIB}/hw
 namespace.sphal.permitted.paths += /odm/${LIB}/egl
@@ -99,14 +99,13 @@
 namespace.sphal.permitted.paths += /system/vendor/${LIB}/hw
 namespace.sphal.permitted.paths += /system/vendor/${LIB}/egl
 # This is exceptionally required since android.hidl.memory@1.0-impl.so is here
-namespace.sphal.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw
+namespace.sphal.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw
 
 namespace.sphal.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp
 namespace.sphal.asan.search.paths +=           /odm/${LIB}/vndk-sp
 namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
 namespace.sphal.asan.search.paths +=           /vendor/${LIB}/vndk-sp
-namespace.sphal.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}
-namespace.sphal.asan.search.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}
+namespace.sphal.asan.search.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}
 
 namespace.sphal.asan.permitted.paths += /data/asan/odm/${LIB}/hw
 namespace.sphal.asan.permitted.paths +=           /odm/${LIB}/hw
@@ -117,8 +116,7 @@
 namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}/egl
 namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}/egl
 
-namespace.sphal.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw
-namespace.sphal.asan.permitted.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}/hw
+namespace.sphal.asan.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw
 
 # Once in this namespace, access to libraries in /system/lib is restricted. Only
 # libs listed here can be used.