commit 12b09530eef23cf34fd2850b8742b75399dc4790
author Josh Gao <jmgao@google.com> Tue Jun 13 05:44:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 13 05:44:44 2017 +0000
tree da00ae0813c93c8ff520e46da22174b94281309e
parent d494cacad1eda73656c4d04a58685c0569620dc8
parent 734e91ba99351e0e341265c0a07978897838512b

Merge "tombstoned: log where we're writing the tombstone." into oc-dev am: 855333f346  -s ours am: 3cca239ce7  -s ours
am: e08880c071  -s ours

Change-Id: Ia0ce94839e9d47804d8bb7a75c4b30afff9c30a4

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