commit 1c2f7b38a86ed5746cf20260d2964336322099b7
author Josh Gao <jmgao@google.com> Thu Jun 08 07:04:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 08 07:04:27 2017 +0000
tree 45a235399a54d77557f452d61d4eb6548ed5ae11
parent 4c1f0869c8129e58f907fd2c128f058933b82aab
parent af08fcd4b9d3928c71b37f3c78ff2873732434f7

adb: improve race between device_connected and device_disconnected. am: f74dd42e4e  -s ours
am: 29c0882ad9  -s ours

Change-Id: I7a96ab6c8bccb622fcb984a5c88ae58960b18818

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 6db9acd..8118e07 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