diff options
| -rw-r--r-- | rootdir/etc/ld.config.legacy.txt | 7 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 21 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 21 |
3 files changed, 35 insertions, 14 deletions
diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index 6ab998874..e598f053f 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -85,8 +85,11 @@ namespace.runtime.isolated = true # android_link_namespaces in libnativeloader. namespace.runtime.visible = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # Need allow_all_shared_libs because libart.so can dlopen oat files in # /system/framework and /data. diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index f75613353..c8c6387e2 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -166,8 +166,11 @@ namespace.runtime.isolated = true # android_link_namespaces in libnativeloader. namespace.runtime.visible = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # Need allow_all_shared_libs because libart.so can dlopen oat files in # /system/framework and /data. @@ -488,8 +491,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so ############################################################################### namespace.runtime.isolated = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = system # TODO(b/130340935): Use a dynamically created linker namespace similar to # classloader-namespace for oat files, and tighten this up. @@ -695,8 +701,11 @@ namespace.runtime.isolated = true # android_link_namespaces in libnativeloader. namespace.runtime.visible = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # TODO(b/130340935): Use a dynamically created linker namespace similar to # classloader-namespace for oat files, and tighten this up. diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 8504ab0bd..4beabd675 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -105,8 +105,11 @@ namespace.runtime.isolated = true # android_link_namespaces in libnativeloader. namespace.runtime.visible = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # Need allow_all_shared_libs because libart.so can dlopen oat files in # /system/framework and /data. @@ -419,8 +422,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so ############################################################################### namespace.runtime.isolated = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # TODO(b/130340935): Use a dynamically created linker namespace similar to # classloader-namespace for oat files, and tighten this up. @@ -503,8 +509,11 @@ namespace.runtime.isolated = true # android_link_namespaces in libnativeloader. namespace.runtime.visible = true -namespace.runtime.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes +namespace.runtime.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.search.paths += /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} +namespace.runtime.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.runtime.links = default # TODO(b/130340935): Use a dynamically created linker namespace similar to # classloader-namespace for oat files, and tighten this up. |