commit d494cacad1eda73656c4d04a58685c0569620dc8
author Josh Gao <jmgao@google.com> Tue Jun 13 03:07:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 13 03:07:58 2017 +0000
tree da00ae0813c93c8ff520e46da22174b94281309e
parent 4e0de23cf9a9aa50974ae23fc57339bffacf7709
parent 6114fe27b3f82c587196f1619d05bbfbcce26aef

Merge "tombstoned: log where we're writing the tombstone." am: 87f5432f52 am: 5e84d90791 am: 4e64f812d7
am: 848a2ba282

Change-Id: I3663c2495181ff1c04b8b86d0ba78862cae23d73

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 621b632..c73e777 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -93,10 +93,10 @@
 # This namespace is exclusively for vndk-sp libs.
 ###############################################################################
 namespace.vndk.isolated = true
-namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/vendor/${LIB}
+namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp
 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/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/data/asan/vendor/${LIB}:/vendor/${LIB}
+namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp
 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