commit 7a50ad40f2bbfe687b1f179fe222c110fbe39c06
author Peter Collingbourne <pcc@google.com> Mon Jun 10 17:57:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 10 17:57:33 2019 -0700
tree 28b3574fd546f26660e84ba2f5ddaec8154e67e3
parent 569a78d816d9ac6ae750819bc51b31b51e9d22ae
parent f3f97245d0553ec2506b7200b68c0b34ebd8e2c0

Merge "Add /apex/com.android.runtime/${LIB} to runtime search path." into qt-r1-dev
am: f3f97245d0

Change-Id: I7294e508adc440814b98ec0dc2814d4a5851f025

apex/ld.config.txt

diff --git a/apex/ld.config.txt b/apex/ld.config.txt
index a5937fd..af8ec06 100644
--- a/apex/ld.config.txt
+++ b/apex/ld.config.txt
@@ -37,9 +37,11 @@
 
 namespace.platform.isolated = true
 
-namespace.platform.search.paths = /system/${LIB}
+namespace.platform.search.paths  = /system/${LIB}
+namespace.platform.search.paths += /apex/com.android.runtime/${LIB}
 namespace.platform.asan.search.paths  = /data/asan/system/${LIB}
 namespace.platform.asan.search.paths +=           /system/${LIB}
+namespace.platform.asan.search.paths += /apex/com.android.runtime/${LIB}
 
 # /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc.
 # Add /apex/... pat to the permitted paths because linker uses realpath(3)