diff options
| author | Jooyung Han <jooyung@google.com> | 2019-10-15 11:17:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-15 11:17:23 -0700 |
| commit | 80c21c9a2c03e034a24bd25e24d8cdea391e453f (patch) | |
| tree | 77eb296de6b9d91975c25050850982c39e033cbc /apex | |
| parent | 0786e82e0ed886ffa228739fca6820245206007b (diff) | |
| parent | aa9c382be3bc801731cd4b39231b360d3e3388d8 (diff) | |
Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905 am: 07bd8e7740 am: d9f7389afa
am: aa9c382be3
Change-Id: I5f018d3d1cb8ce27b629acc7fc96738b46c837ba
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/ld.config.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apex/ld.config.txt b/apex/ld.config.txt index 8f60bb21c9..5db59e53d1 100644 --- a/apex/ld.config.txt +++ b/apex/ld.config.txt @@ -95,7 +95,7 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB} 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 @@ -104,14 +104,13 @@ namespace.sphal.permitted.paths += /vendor/${LIB}/egl 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 @@ -122,8 +121,7 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB}/hw 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. |