commit fd7d7dd579b41ee99363c999a71a602de963e715
author Logan Chien <loganchien@google.com> Tue Feb 12 20:29:23 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 20:29:23 2019 -0800
tree c259c5a143667ea05f299faeb11d689c68960b91
parent 27affd0614bcb8915a9bca29dc58e2bab80f18e1
parent dec5e261981a3455ef2691e7d9b23ebc426a317a

Merge "Fix APEX run-time ld.config.txt for ASAN targets" am: 8540f50887
am: 321b1a6345

Change-Id: I465aee0c808c892e520ce3e2574ae6fa0154e142

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 2a44ae4..5e2d79c 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -409,6 +409,7 @@
 
 # Keep in sync with ld.config.txt in the com.android.runtime APEX.
 namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
 namespace.runtime.links = system
 # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
 # when it exists.

rootdir/etc/ld.config.vndk_lite.txt

diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 23b4e7d..3c97a49 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -350,6 +350,7 @@
 
 # Keep in sync with ld.config.txt in the com.android.runtime APEX.
 namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
 namespace.runtime.links = default
 # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
 # when it exists.