diff --git a/apex/ld.config.txt b/apex/ld.config.txt index af8ec066c0..8f60bb21c9 100644 --- a/apex/ld.config.txt +++ b/apex/ld.config.txt @@ -38,9 +38,14 @@ namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv namespace.platform.isolated = true 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} + +# TODO(b/140790209): These directories are wrong in R and later because they +# only contain Bionic internal libraries dependencies that should not be +# accessed from the outside. However, they may be necessary for APEX builds that +# are pushed to Q. Remove them as soon as Q compatibility is no longer required. +namespace.platform.search.paths += /apex/com.android.runtime/${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.