diff options
| author | Jooyung Han <jooyung@google.com> | 2019-10-17 05:37:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-17 05:37:11 -0700 |
| commit | 357b67c9b1ece986da6ec8215d61a7788feb6e95 (patch) | |
| tree | e8ea8f3fb56cb63a43e5c1ddb996bcb0354528b6 /apex | |
| parent | aa05782462c7190556d41f6ce70d5db7e09b7ed9 (diff) | |
| parent | 76f35ab7ddd28570e7eb9ad08b20eca44e166e75 (diff) | |
Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38f4 am: 36f40f8dd5 am: 5e42ca0676
am: 76f35ab7dd
Change-Id: Ic868c7e693f32d51a2ee5cd9aebc87bfe733712b
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/ld.config.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apex/ld.config.txt b/apex/ld.config.txt index 5db59e53d1..8f60bb21c9 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 += /apex/com.android.vndk.v${VNDK_VER}/${LIB} +namespace.sphal.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} namespace.sphal.permitted.paths += /odm/${LIB}/hw namespace.sphal.permitted.paths += /odm/${LIB}/egl @@ -104,13 +104,14 @@ 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 += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw +namespace.sphal.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/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 += /apex/com.android.vndk.v${VNDK_VER}/${LIB} +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.permitted.paths += /data/asan/odm/${LIB}/hw namespace.sphal.asan.permitted.paths += /odm/${LIB}/hw @@ -121,7 +122,8 @@ 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 += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw +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 # Once in this namespace, access to libraries in /system/lib is restricted. Only # libs listed here can be used. |