commit f3f97245d0553ec2506b7200b68c0b34ebd8e2c0
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 11 00:31:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 00:31:44 2019 +0000
tree a762f7ff87047452dbd07330e74df77d33080631
parent aefeb2ab9ea6556cffcbd902db8c1c181c19bca8
parent 97835e9715f03014301464461bfa91015d91dfe9

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

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)