diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-04 04:19:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-04 04:19:33 +0000 |
| commit | d5398bf97d6d8f7f858049b934890f4821fb17fe (patch) | |
| tree | ebaa4bad026e2f876c4a9c5d55af9b1074a9bca8 | |
| parent | 22d73dd0931f57441549c5553b763c302baf7654 (diff) | |
| parent | c641e19c7ee83b7418ec5aba2394706e95137d9b (diff) | |
Merge "update /vendor/*/vndk-sp to /system/*/vndk-sp" into oc-dev
| -rw-r--r-- | rootdir/etc/ld.config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 21179fbaa..e8a34bf3b 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -97,7 +97,7 @@ namespace.vndk.isolated = true namespace.vndk.search.paths = /system/${LIB}/vndk-sp:/vendor/${LIB} namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl -namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/vendor/${LIB}:/vendor/${LIB} +namespace.vndk.asan.search.paths = /data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/data/asan/vendor/${LIB}:/vendor/${LIB} namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl # When these NDK libs are required inside this namespace, then it is redirected @@ -115,6 +115,6 @@ namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libst [vendor] namespace.default.isolated = false -namespace.default.search.paths = /vendor/${LIB}:/vendor/${LIB}/vndk-sp:/system/${LIB} +namespace.default.search.paths = /vendor/${LIB}:/system/${LIB}/vndk-sp:/system/${LIB} -namespace.default.asan.search.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}:/system/${LIB} +namespace.default.asan.search.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/data/asan/system/${LIB}:/system/${LIB} |