From 84d3247b545945342fab2b9e35e7b9be60f19c61 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Thu, 16 Apr 2020 19:50:13 +0100 Subject: Make com_android_i18n namespace visible libnativeloader calls android_get_exported_namespace to link this namepsace to classloader namespace. Bug: 138994281 Test: CtsJniTestCases Change-Id: I65b97bdba462a11d7389b84d873c4daa9c08b45d --- .../stage2/com.android.runtime/ld.config.txt | 30 +++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'testdata/golden_output/stage2/com.android.runtime/ld.config.txt') diff --git a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt index a8d9c2e..97dcf8b 100644 --- a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.runtime = /apex/com.android.runtime/bin [com.android.runtime] -additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.runtime/${LIB} namespace.default.permitted.paths = /apex/com.android.runtime/${LIB} @@ -41,10 +41,28 @@ namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /data namespace.com_android_art.asan.permitted.paths += /system/framework namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = system,com_android_adbd,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,com_android_i18n,com_android_neuralnetworks namespace.com_android_art.link.system.allow_all_shared_libs = true namespace.com_android_art.link.com_android_adbd.shared_libs = libadbconnection_client.so +namespace.com_android_art.link.com_android_i18n.shared_libs = libandroidicu.so +namespace.com_android_art.link.com_android_i18n.shared_libs += libicu_jni.so +namespace.com_android_art.link.com_android_i18n.shared_libs += libicui18n.so +namespace.com_android_art.link.com_android_i18n.shared_libs += libicuuc.so namespace.com_android_art.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so +namespace.com_android_i18n.isolated = true +namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} +namespace.com_android_i18n.permitted.paths = /apex/com.android.i18n/${LIB} +namespace.com_android_i18n.permitted.paths += /system/${LIB} +namespace.com_android_i18n.asan.search.paths = /apex/com.android.i18n/${LIB} +namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} +namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} +namespace.com_android_i18n.links = system +namespace.com_android_i18n.link.system.shared_libs = libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += liblog.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libaaudio.so:libadbd_auth.so:libadbd_fs.so:libandroid.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libdl_android.so:libft2.so:libincident.so:liblog.so:libm.so:libmediametrics.so:libmediandk.so:libnativewindow.so:libneuralnetworks_packageinfo.so:libsync.so:libvndksupport.so:libvulkan.so:libselinux.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -70,11 +88,11 @@ namespace.system.permitted.paths = /apex/com.android.runtime/${LIB}/bionic namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.permitted.paths = /apex/com.android.runtime/${LIB}/bionic -namespace.system.links = com_android_art -namespace.system.link.com_android_art.shared_libs = libandroidicu.so -namespace.system.link.com_android_art.shared_libs += libdexfile_external.so +namespace.system.links = com_android_i18n,com_android_art +namespace.system.link.com_android_i18n.shared_libs = libandroidicu.so +namespace.system.link.com_android_i18n.shared_libs += libpac.so +namespace.system.link.com_android_art.shared_libs = libdexfile_external.so namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so namespace.system.link.com_android_art.shared_libs += libnativebridge.so namespace.system.link.com_android_art.shared_libs += libnativehelper.so namespace.system.link.com_android_art.shared_libs += libnativeloader.so -namespace.system.link.com_android_art.shared_libs += libpac.so -- cgit v1.2.3