From 6c8203f28990363fc0bdb125f13138b2d5f7d544 Mon Sep 17 00:00:00 2001 From: vichang Date: Tue, 5 May 2020 11:11:30 +0000 Subject: [PATCH] Revert "Make com_android_i18n namespace visible" Revert submission 1299494-i18nApex Reason for revert: Breaking aosp_x86-eng on aosp-master Reverted Changes: I30fc3735b:Move ICU from ART APEX to i18n APEX Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c... Ic7de63fe3:Move core-icu4j into I18n APEX I65b97bdba:Make com_android_i18n namespace visible Ia4c83bc15:Move v8 and libpac into i18n APEX I10e6d4948:Move core-icu4j into i18n APEX I8d989cad7:Move ICU from ART APEX into i18n APEX I72216ca12:Move ICU into i18n APEX Ief9dace85:Add shared library into i18n APEX and add the requ... I7d97a10ba:Move libpac into i18n APEX I90fff9c55:Move ICU from ART APEX into i18n APEX Change-Id: I8e170a25fb334c12af5c2fe4a1fb4afafd56d096 --- contents/section/apexart.cc | 1 - contents/section/legacy.cc | 1 - contents/section/system.cc | 1 - contents/section/unrestricted.cc | 1 - .../legacy/com.android.adbd/ld.config.txt | 30 +---- .../legacy/com.android.art/ld.config.txt | 31 +---- .../legacy/com.android.conscrypt/ld.config.txt | 30 +---- .../legacy/com.android.media.swcodec/ld.config.txt | 39 ++---- .../legacy/com.android.runtime/ld.config.txt | 30 +---- .../legacy/com.android.sdkext/ld.config.txt | 30 +---- testdata/golden_output/legacy/ld.config.txt | 35 ++---- .../product-enabled/com.android.adbd/ld.config.txt | 30 +---- .../product-enabled/com.android.art/ld.config.txt | 31 +---- .../com.android.conscrypt/ld.config.txt | 30 +---- .../com.android.media.swcodec/ld.config.txt | 30 +---- .../com.android.runtime/ld.config.txt | 30 +---- .../com.android.sdkext/ld.config.txt | 30 +---- .../golden_output/product-enabled/ld.config.txt | 134 +++++---------------- .../stage1/com.android.art/ld.config.txt | 31 +---- .../stage1/com.android.runtime/ld.config.txt | 30 +---- testdata/golden_output/stage1/ld.config.txt | 102 ++++------------ .../stage2/com.android.adbd/ld.config.txt | 30 +---- .../stage2/com.android.art/ld.config.txt | 31 +---- .../stage2/com.android.conscrypt/ld.config.txt | 30 +---- .../stage2/com.android.media.swcodec/ld.config.txt | 30 +---- .../stage2/com.android.runtime/ld.config.txt | 30 +---- .../stage2/com.android.sdkext/ld.config.txt | 30 +---- testdata/golden_output/stage2/ld.config.txt | 102 ++++------------ .../vndk-lite/com.android.adbd/ld.config.txt | 30 +---- .../vndk-lite/com.android.art/ld.config.txt | 31 +---- .../vndk-lite/com.android.conscrypt/ld.config.txt | 30 +---- .../com.android.media.swcodec/ld.config.txt | 30 +---- .../vndk-lite/com.android.runtime/ld.config.txt | 30 +---- .../vndk-lite/com.android.sdkext/ld.config.txt | 30 +---- testdata/golden_output/vndk-lite/ld.config.txt | 94 ++++----------- .../root/apex/com.android.art/apex_manifest.json | 10 +- .../root/apex/com.android.i18n/apex_manifest.json | 15 +-- 37 files changed, 270 insertions(+), 1020 deletions(-) diff --git a/contents/section/apexart.cc b/contents/section/apexart.cc index 118ce48..51b2730 100644 --- a/contents/section/apexart.cc +++ b/contents/section/apexart.cc @@ -42,7 +42,6 @@ Section BuildApexArtSection(Context& ctx, const ApexInfo& apex_info) { std::move(namespaces), { "com.android.art", - "com.android.i18n", "com.android.conscrypt", "com.android.neuralnetworks", }); diff --git a/contents/section/legacy.cc b/contents/section/legacy.cc index 0b6d4eb..4ec5085 100644 --- a/contents/section/legacy.cc +++ b/contents/section/legacy.cc @@ -35,7 +35,6 @@ Section BuildLegacySection(Context& ctx) { std::set visible_apexes{ "com.android.art", - "com.android.i18n", "com.android.neuralnetworks", "com.android.runtime", "com.android.media", diff --git a/contents/section/system.cc b/contents/section/system.cc index c6217bc..0b15ec9 100644 --- a/contents/section/system.cc +++ b/contents/section/system.cc @@ -45,7 +45,6 @@ Section BuildSystemSection(Context& ctx) { std::set visible_apexes{ "com.android.art", - "com.android.i18n", "com.android.neuralnetworks", "com.android.runtime", "com.android.media", diff --git a/contents/section/unrestricted.cc b/contents/section/unrestricted.cc index f5492ee..64b9d54 100644 --- a/contents/section/unrestricted.cc +++ b/contents/section/unrestricted.cc @@ -41,7 +41,6 @@ Section BuildUnrestrictedSection(Context& ctx) { std::set visible_apexes{ "com.android.art", - "com.android.i18n", "com.android.neuralnetworks", "com.android.runtime", "com.android.media", diff --git a/testdata/golden_output/legacy/com.android.adbd/ld.config.txt b/testdata/golden_output/legacy/com.android.adbd/ld.config.txt index 15534b9..f2ca95b 100644 --- a/testdata/golden_output/legacy/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.adbd/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.adbd = /apex/com.android.adbd/bin [com.android.adbd] -additional.namespaces = com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.adbd/${LIB} namespace.default.permitted.paths = /apex/com.android.adbd/${LIB} @@ -30,28 +30,10 @@ 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,default,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,default,com_android_neuralnetworks namespace.com_android_art.link.system.allow_all_shared_libs = true namespace.com_android_art.link.default.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} @@ -77,11 +59,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_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.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.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 diff --git a/testdata/golden_output/legacy/com.android.art/ld.config.txt b/testdata/golden_output/legacy/com.android.art/ld.config.txt index a2e720b..7007a32 100644 --- a/testdata/golden_output/legacy/com.android.art/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.art/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.art = /apex/com.android.art/bin [com.android.art] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.links = com_android_art,system,com_android_adbd namespace.default.link.com_android_art.allow_all_shared_libs = true @@ -35,13 +35,9 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -59,21 +55,6 @@ namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so namespace.com_android_conscrypt.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_conscrypt.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -100,11 +81,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_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.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.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 diff --git a/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt b/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt index bc1b571..e5e18d6 100644 --- a/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.conscrypt = /apex/com.android.conscrypt/bin [com.android.conscrypt] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.conscrypt/${LIB} namespace.default.permitted.paths = /apex/com.android.conscrypt/${LIB} @@ -45,28 +45,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -92,11 +74,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_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.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.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 diff --git a/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt index bdfbacc..885e300 100644 --- a/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.media.swcodec = /apex/com.android.media.swcodec/bin [com.android.media.swcodec] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,sphal,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,sphal,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB} namespace.default.permitted.paths = /apex/com.android.media.swcodec/${LIB} @@ -49,28 +49,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -94,25 +76,20 @@ namespace.sphal.visible = true namespace.sphal.search.paths = /odm/${LIB} namespace.sphal.search.paths += /vendor/${LIB} namespace.sphal.search.paths += /vendor/${LIB}/hw -namespace.sphal.search.paths += /system/${LIB} namespace.sphal.permitted.paths = /odm/${LIB} namespace.sphal.permitted.paths += /vendor/${LIB} namespace.sphal.permitted.paths += /system/vendor/${LIB} -namespace.sphal.permitted.paths += /system/${LIB} namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} namespace.sphal.asan.search.paths += /odm/${LIB} namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.search.paths += /vendor/${LIB} -namespace.sphal.asan.search.paths += /data/asan/system/${LIB} -namespace.sphal.asan.search.paths += /system/${LIB} namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB} namespace.sphal.asan.permitted.paths += /odm/${LIB} namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} -namespace.sphal.asan.permitted.paths += /data/asan/system/${LIB} -namespace.sphal.asan.permitted.paths += /system/${LIB} namespace.sphal.links = system -namespace.sphal.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.sphal.link.system.shared_libs = libz.so +namespace.sphal.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.sphal.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.system.isolated = true namespace.system.visible = true @@ -121,11 +98,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_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.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.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 diff --git a/testdata/golden_output/legacy/com.android.runtime/ld.config.txt b/testdata/golden_output/legacy/com.android.runtime/ld.config.txt index 97dcf8b..a8d9c2e 100644 --- a/testdata/golden_output/legacy/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/legacy/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_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,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,28 +41,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -88,11 +70,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_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.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.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 diff --git a/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt b/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt index 3662893..4bd62b9 100644 --- a/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.sdkext = /apex/com.android.sdkext/bin [com.android.sdkext] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.sdkext/${LIB} namespace.default.permitted.paths = /apex/com.android.sdkext/${LIB} @@ -40,28 +40,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -87,11 +69,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_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.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.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 diff --git a/testdata/golden_output/legacy/ld.config.txt b/testdata/golden_output/legacy/ld.config.txt index a60ac1b..a53b874 100644 --- a/testdata/golden_output/legacy/ld.config.txt +++ b/testdata/golden_output/legacy/ld.config.txt @@ -7,7 +7,7 @@ dir.legacy = /sbin dir.postinstall = /postinstall dir.legacy = /data [legacy] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -25,16 +25,16 @@ namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -62,13 +62,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -102,21 +98,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} diff --git a/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt b/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt index 15534b9..f2ca95b 100644 --- a/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.adbd = /apex/com.android.adbd/bin [com.android.adbd] -additional.namespaces = com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.adbd/${LIB} namespace.default.permitted.paths = /apex/com.android.adbd/${LIB} @@ -30,28 +30,10 @@ 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,default,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,default,com_android_neuralnetworks namespace.com_android_art.link.system.allow_all_shared_libs = true namespace.com_android_art.link.default.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} @@ -77,11 +59,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_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.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.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 diff --git a/testdata/golden_output/product-enabled/com.android.art/ld.config.txt b/testdata/golden_output/product-enabled/com.android.art/ld.config.txt index a2e720b..7007a32 100644 --- a/testdata/golden_output/product-enabled/com.android.art/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.art/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.art = /apex/com.android.art/bin [com.android.art] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.links = com_android_art,system,com_android_adbd namespace.default.link.com_android_art.allow_all_shared_libs = true @@ -35,13 +35,9 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -59,21 +55,6 @@ namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so namespace.com_android_conscrypt.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_conscrypt.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -100,11 +81,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_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.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.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 diff --git a/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt b/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt index bc1b571..e5e18d6 100644 --- a/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.conscrypt = /apex/com.android.conscrypt/bin [com.android.conscrypt] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.conscrypt/${LIB} namespace.default.permitted.paths = /apex/com.android.conscrypt/${LIB} @@ -45,28 +45,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -92,11 +74,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_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.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.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 diff --git a/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt index 7e8cc6f..63ed302 100644 --- a/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.media.swcodec = /apex/com.android.media.swcodec/bin [com.android.media.swcodec] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,sphal,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,sphal,system,vndk namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB} namespace.default.permitted.paths = /apex/com.android.media.swcodec/${LIB} @@ -49,28 +49,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -117,14 +99,14 @@ 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_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.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.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 namespace.vndk.isolated = true namespace.vndk.visible = true namespace.vndk.search.paths = /odm/${LIB}/vndk-sp diff --git a/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt b/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt index 97dcf8b..a8d9c2e 100644 --- a/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/product-enabled/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_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,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,28 +41,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -88,11 +70,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_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.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.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 diff --git a/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt b/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt index 3662893..4bd62b9 100644 --- a/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.sdkext = /apex/com.android.sdkext/bin [com.android.sdkext] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.sdkext/${LIB} namespace.default.permitted.paths = /apex/com.android.sdkext/${LIB} @@ -40,28 +40,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -87,11 +69,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_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.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.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 diff --git a/testdata/golden_output/product-enabled/ld.config.txt b/testdata/golden_output/product-enabled/ld.config.txt index 52dd049..4ac4352 100644 --- a/testdata/golden_output/product-enabled/ld.config.txt +++ b/testdata/golden_output/product-enabled/ld.config.txt @@ -18,7 +18,7 @@ dir.unrestricted = /data/local/tmp dir.postinstall = /postinstall dir.system = /data [system] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk,vndk_product +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk,vndk_product namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -81,16 +81,16 @@ namespace.default.asan.permitted.paths += /data namespace.default.asan.permitted.paths += /mnt/expand namespace.default.asan.permitted.paths += /apex/com.android.runtime/${LIB}/bionic namespace.default.asan.permitted.paths += /system/${LIB}/bootstrap -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -118,13 +118,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -158,21 +154,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -336,7 +317,7 @@ namespace.vndk_product.link.default.shared_libs += libEGL.so:libGLESv1_CM.so:lib namespace.vndk_product.link.default.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.vndk_product.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_runtime,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,com_android_runtime,system,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /odm/${LIB} @@ -383,28 +364,10 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = system,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -443,12 +406,12 @@ namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /data/asan/system_ext/${LIB} namespace.system.asan.search.paths += /system_ext/${LIB} -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 += libicui18n.so -namespace.system.link.com_android_i18n.shared_libs += libicuuc.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so +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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs += libicui18n.so +namespace.system.link.com_android_art.shared_libs += libicuuc.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 @@ -474,7 +437,7 @@ namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libcla namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [product] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_runtime,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,com_android_runtime,system,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /product/${LIB} @@ -515,28 +478,10 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = system,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -575,12 +520,12 @@ namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /data/asan/system_ext/${LIB} namespace.system.asan.search.paths += /system_ext/${LIB} -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 += libicui18n.so -namespace.system.link.com_android_i18n.shared_libs += libicuuc.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so +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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs += libicui18n.so +namespace.system.link.com_android_art.shared_libs += libicuuc.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 @@ -600,7 +545,7 @@ namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libcla namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [unrestricted] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -612,16 +557,16 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -649,13 +594,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -689,21 +630,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} diff --git a/testdata/golden_output/stage1/com.android.art/ld.config.txt b/testdata/golden_output/stage1/com.android.art/ld.config.txt index a682126..ef10416 100644 --- a/testdata/golden_output/stage1/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage1/com.android.art/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.art = /apex/com.android.art/bin [com.android.art] -additional.namespaces = com_android_art,com_android_i18n,system +additional.namespaces = com_android_art,system namespace.default.isolated = true namespace.default.links = com_android_art,system namespace.default.link.com_android_art.allow_all_shared_libs = true @@ -19,27 +19,8 @@ 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_i18n +namespace.com_android_art.links = system namespace.com_android_art.link.system.allow_all_shared_libs = true -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_i18n.isolated = true -namespace.com_android_i18n.visible = 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.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} @@ -47,11 +28,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_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.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.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 diff --git a/testdata/golden_output/stage1/com.android.runtime/ld.config.txt b/testdata/golden_output/stage1/com.android.runtime/ld.config.txt index 735a7e9..cceda7e 100644 --- a/testdata/golden_output/stage1/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage1/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_art,com_android_i18n,system +additional.namespaces = com_android_art,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.runtime/${LIB} namespace.default.permitted.paths = /apex/com.android.runtime/${LIB} @@ -26,26 +26,8 @@ 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_i18n +namespace.com_android_art.links = system namespace.com_android_art.link.system.allow_all_shared_libs = true -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_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.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} @@ -53,11 +35,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_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.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.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 diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt index 1e57021..40e275a 100644 --- a/testdata/golden_output/stage1/ld.config.txt +++ b/testdata/golden_output/stage1/ld.config.txt @@ -18,7 +18,7 @@ dir.unrestricted = /data/local/tmp dir.postinstall = /postinstall dir.system = /data [system] -additional.namespaces = com_android_art,com_android_i18n,com_android_runtime,rs,sphal,vndk +additional.namespaces = com_android_art,com_android_runtime,rs,sphal,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -86,16 +86,16 @@ namespace.default.asan.permitted.paths += /mnt/expand namespace.default.asan.permitted.paths += /apex/com.android.runtime/${LIB}/bionic namespace.default.asan.permitted.paths += /system/${LIB}/bootstrap namespace.default.asan.permitted.paths += /product/${LIB} -namespace.default.links = com_android_i18n,com_android_art -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -106,27 +106,8 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_i18n +namespace.com_android_art.links = default namespace.com_android_art.link.default.allow_all_shared_libs = true -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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -223,7 +204,7 @@ namespace.vndk.link.default.shared_libs += libEGL.so:libGLESv1_CM.so:libGLESv2.s namespace.vndk.link.default.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.vndk.link.sphal.allow_all_shared_libs = true [vendor] -additional.namespaces = com_android_art,com_android_i18n,com_android_runtime,system,vndk +additional.namespaces = com_android_art,com_android_runtime,system,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /odm/${LIB} @@ -254,26 +235,8 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = system,com_android_i18n +namespace.com_android_art.links = system namespace.com_android_art.link.system.allow_all_shared_libs = true -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_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_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -296,12 +259,12 @@ namespace.system.asan.search.paths += /data/asan/system_ext/${LIB} namespace.system.asan.search.paths += /system_ext/${LIB} namespace.system.asan.search.paths += /data/asan/product/${LIB} namespace.system.asan.search.paths += /product/${LIB} -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 += libicui18n.so -namespace.system.link.com_android_i18n.shared_libs += libicuuc.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so +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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs += libicui18n.so +namespace.system.link.com_android_art.shared_libs += libicuuc.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 @@ -326,7 +289,7 @@ namespace.vndk.link.system.shared_libs += libEGL.so:libGLESv1_CM.so:libGLESv2.so namespace.vndk.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.vndk.link.default.allow_all_shared_libs = true [unrestricted] -additional.namespaces = com_android_art,com_android_i18n,com_android_runtime +additional.namespaces = com_android_art,com_android_runtime namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -338,16 +301,16 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.links = com_android_i18n,com_android_art -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -358,27 +321,8 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_i18n +namespace.com_android_art.links = default namespace.com_android_art.link.default.allow_all_shared_libs = true -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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} diff --git a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt index 15534b9..f2ca95b 100644 --- a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.adbd = /apex/com.android.adbd/bin [com.android.adbd] -additional.namespaces = com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.adbd/${LIB} namespace.default.permitted.paths = /apex/com.android.adbd/${LIB} @@ -30,28 +30,10 @@ 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,default,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,default,com_android_neuralnetworks namespace.com_android_art.link.system.allow_all_shared_libs = true namespace.com_android_art.link.default.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} @@ -77,11 +59,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_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.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.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 diff --git a/testdata/golden_output/stage2/com.android.art/ld.config.txt b/testdata/golden_output/stage2/com.android.art/ld.config.txt index a2e720b..7007a32 100644 --- a/testdata/golden_output/stage2/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.art/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.art = /apex/com.android.art/bin [com.android.art] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.links = com_android_art,system,com_android_adbd namespace.default.link.com_android_art.allow_all_shared_libs = true @@ -35,13 +35,9 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -59,21 +55,6 @@ namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so namespace.com_android_conscrypt.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_conscrypt.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -100,11 +81,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_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.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.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 diff --git a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt index bc1b571..e5e18d6 100644 --- a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.conscrypt = /apex/com.android.conscrypt/bin [com.android.conscrypt] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.conscrypt/${LIB} namespace.default.permitted.paths = /apex/com.android.conscrypt/${LIB} @@ -45,28 +45,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -92,11 +74,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_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.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.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 diff --git a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt index 7e8cc6f..63ed302 100644 --- a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.media.swcodec = /apex/com.android.media.swcodec/bin [com.android.media.swcodec] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,sphal,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,sphal,system,vndk namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB} namespace.default.permitted.paths = /apex/com.android.media.swcodec/${LIB} @@ -49,28 +49,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -117,14 +99,14 @@ 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_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.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.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 namespace.vndk.isolated = true namespace.vndk.visible = true namespace.vndk.search.paths = /odm/${LIB}/vndk-sp 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 97dcf8b..a8d9c2e 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_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,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,28 +41,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -88,11 +70,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_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.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.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 diff --git a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt index 3662893..4bd62b9 100644 --- a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.sdkext = /apex/com.android.sdkext/bin [com.android.sdkext] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.sdkext/${LIB} namespace.default.permitted.paths = /apex/com.android.sdkext/${LIB} @@ -40,28 +40,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -87,11 +69,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_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.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.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 diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt index 9271c7c..45f6578 100644 --- a/testdata/golden_output/stage2/ld.config.txt +++ b/testdata/golden_output/stage2/ld.config.txt @@ -18,7 +18,7 @@ dir.unrestricted = /data/local/tmp dir.postinstall = /postinstall dir.system = /data [system] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -86,16 +86,16 @@ namespace.default.asan.permitted.paths += /mnt/expand namespace.default.asan.permitted.paths += /apex/com.android.runtime/${LIB}/bionic namespace.default.asan.permitted.paths += /system/${LIB}/bootstrap namespace.default.asan.permitted.paths += /product/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -123,13 +123,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -163,21 +159,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -329,7 +310,7 @@ namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libcl namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_runtime,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,com_android_runtime,system,vndk namespace.default.isolated = true namespace.default.visible = true namespace.default.search.paths = /odm/${LIB} @@ -376,28 +357,10 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = system,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -439,12 +402,12 @@ namespace.system.asan.search.paths += /data/asan/system_ext/${LIB} namespace.system.asan.search.paths += /system_ext/${LIB} namespace.system.asan.search.paths += /data/asan/product/${LIB} namespace.system.asan.search.paths += /product/${LIB} -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 += libicui18n.so -namespace.system.link.com_android_i18n.shared_libs += libicuuc.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so +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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs += libicui18n.so +namespace.system.link.com_android_art.shared_libs += libicuuc.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 @@ -470,7 +433,7 @@ namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libcla namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [unrestricted] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -482,16 +445,16 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -519,13 +482,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -559,21 +518,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} diff --git a/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt index 15534b9..f2ca95b 100644 --- a/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.adbd = /apex/com.android.adbd/bin [com.android.adbd] -additional.namespaces = com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.adbd/${LIB} namespace.default.permitted.paths = /apex/com.android.adbd/${LIB} @@ -30,28 +30,10 @@ 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,default,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,default,com_android_neuralnetworks namespace.com_android_art.link.system.allow_all_shared_libs = true namespace.com_android_art.link.default.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} @@ -77,11 +59,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_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.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.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 diff --git a/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt index a2e720b..7007a32 100644 --- a/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.art = /apex/com.android.art/bin [com.android.art] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.links = com_android_art,system,com_android_adbd namespace.default.link.com_android_art.allow_all_shared_libs = true @@ -35,13 +35,9 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -59,21 +55,6 @@ namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so namespace.com_android_conscrypt.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_conscrypt.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -100,11 +81,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_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.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.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 diff --git a/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt index bc1b571..e5e18d6 100644 --- a/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.conscrypt = /apex/com.android.conscrypt/bin [com.android.conscrypt] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.conscrypt/${LIB} namespace.default.permitted.paths = /apex/com.android.conscrypt/${LIB} @@ -45,28 +45,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -92,11 +74,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_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.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.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 diff --git a/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt index 42e951b..e5b040d 100644 --- a/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.media.swcodec = /apex/com.android.media.swcodec/bin [com.android.media.swcodec] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,sphal,system,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,sphal,system,vndk namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB} namespace.default.permitted.paths = /apex/com.android.media.swcodec/${LIB} @@ -49,28 +49,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -117,14 +99,14 @@ 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_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.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.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 namespace.vndk.isolated = true namespace.vndk.visible = true namespace.vndk.search.paths = /odm/${LIB}/vndk-sp diff --git a/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt index 97dcf8b..a8d9c2e 100644 --- a/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/vndk-lite/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_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,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,28 +41,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -88,11 +70,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_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.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.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 diff --git a/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt index 3662893..4bd62b9 100644 --- a/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt @@ -1,6 +1,6 @@ dir.com.android.sdkext = /apex/com.android.sdkext/bin [com.android.sdkext] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,system +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,system namespace.default.isolated = true namespace.default.search.paths = /apex/com.android.sdkext/${LIB} namespace.default.permitted.paths = /apex/com.android.sdkext/${LIB} @@ -40,28 +40,10 @@ 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_i18n,com_android_neuralnetworks +namespace.com_android_art.links = system,com_android_adbd,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} @@ -87,11 +69,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_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.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.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 diff --git a/testdata/golden_output/vndk-lite/ld.config.txt b/testdata/golden_output/vndk-lite/ld.config.txt index e3baf1b..1ba24c7 100644 --- a/testdata/golden_output/vndk-lite/ld.config.txt +++ b/testdata/golden_output/vndk-lite/ld.config.txt @@ -18,7 +18,7 @@ dir.unrestricted = /data/local/tmp dir.postinstall = /postinstall dir.system = /data [system] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime,rs,sphal,vndk namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -36,16 +36,16 @@ namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -73,13 +73,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -113,21 +109,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -277,7 +258,7 @@ namespace.vndk.link.default.shared_libs += libEGL.so:libGLESv1_CM.so:libGLESv2.s namespace.vndk.link.default.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.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] -additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_runtime +additional.namespaces = com_android_adbd,com_android_art,com_android_neuralnetworks,com_android_runtime namespace.default.isolated = false namespace.default.search.paths = /odm/${LIB} namespace.default.search.paths += /odm/${LIB}/vndk @@ -315,14 +296,14 @@ namespace.default.asan.permitted.paths = /data/asan/odm namespace.default.asan.permitted.paths += /odm namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /vendor -namespace.default.links = com_android_art,com_android_i18n,com_android_neuralnetworks +namespace.default.links = com_android_art,com_android_neuralnetworks namespace.default.link.com_android_art.shared_libs = libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so -namespace.default.link.com_android_i18n.shared_libs = libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} @@ -343,24 +324,10 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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 = default -namespace.com_android_i18n.link.default.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.default.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.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -384,7 +351,7 @@ namespace.com_android_runtime.links = default namespace.com_android_runtime.link.default.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_runtime.link.default.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 [unrestricted] -additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime +additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_media,com_android_neuralnetworks,com_android_resolv,com_android_runtime namespace.default.isolated = false namespace.default.visible = true namespace.default.search.paths = /system/${LIB} @@ -396,16 +363,16 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.links = com_android_i18n,com_android_art,com_android_resolv,com_android_neuralnetworks -namespace.default.link.com_android_i18n.shared_libs = libandroidicu.so -namespace.default.link.com_android_i18n.shared_libs += libicui18n.so -namespace.default.link.com_android_i18n.shared_libs += libicuuc.so -namespace.default.link.com_android_i18n.shared_libs += libpac.so -namespace.default.link.com_android_art.shared_libs = libdexfile_external.so +namespace.default.links = com_android_art,com_android_resolv,com_android_neuralnetworks +namespace.default.link.com_android_art.shared_libs = libandroidicu.so +namespace.default.link.com_android_art.shared_libs += libdexfile_external.so namespace.default.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs += libicui18n.so +namespace.default.link.com_android_art.shared_libs += libicuuc.so namespace.default.link.com_android_art.shared_libs += libnativebridge.so namespace.default.link.com_android_art.shared_libs += libnativehelper.so namespace.default.link.com_android_art.shared_libs += libnativeloader.so +namespace.default.link.com_android_art.shared_libs += libpac.so namespace.default.link.com_android_resolv.shared_libs = libnetd_resolv.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true @@ -433,13 +400,9 @@ namespace.com_android_art.asan.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths = /apex/com.android.art/${LIB} namespace.com_android_art.asan.permitted.paths += /system/${LIB} namespace.com_android_art.asan.permitted.paths += /apex/com.android.art/javalib -namespace.com_android_art.links = default,com_android_adbd,com_android_i18n,com_android_neuralnetworks +namespace.com_android_art.links = default,com_android_adbd,com_android_neuralnetworks namespace.com_android_art.link.default.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_conscrypt.isolated = true namespace.com_android_conscrypt.visible = true @@ -473,21 +436,6 @@ namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so namespace.com_android_cronet.link.default.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_cronet.link.default.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_i18n.isolated = true -namespace.com_android_i18n.visible = 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 = default -namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += liblog.so -namespace.com_android_i18n.link.default.shared_libs += libm.so -namespace.com_android_i18n.link.default.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.default.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_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} diff --git a/testdata/root/apex/com.android.art/apex_manifest.json b/testdata/root/apex/com.android.art/apex_manifest.json index 7a9b371..0ca88d0 100644 --- a/testdata/root/apex/com.android.art/apex_manifest.json +++ b/testdata/root/apex/com.android.art/apex_manifest.json @@ -2,18 +2,18 @@ "name": "com.android.art", "version": 1, "provideNativeLibs": [ + "libicui18n.so", + "libicuuc.so", + "libandroidicu.so", "libandroidio.so", "libdexfile_external.so", "libdexfiled_external.so", "libnativebridge.so", "libnativehelper.so", - "libnativeloader.so" + "libnativeloader.so", + "libpac.so" ], "requireNativeLibs": [ - "libandroidicu.so", - "libicuuc.so", - "libicui18n.so", - "libicu_jni.so", "libneuralnetworks.so", "libadbconnection_client.so", "libc.so", diff --git a/testdata/root/apex/com.android.i18n/apex_manifest.json b/testdata/root/apex/com.android.i18n/apex_manifest.json index c853003..49e13dd 100644 --- a/testdata/root/apex/com.android.i18n/apex_manifest.json +++ b/testdata/root/apex/com.android.i18n/apex_manifest.json @@ -1,17 +1,6 @@ { "name": "com.android.i18n", "version": 1, - "provideNativeLibs": [ - "libandroidicu.so", - "libicui18n.so", - "libicuuc.so", - "libicu_jni.so", - "libpac.so" - ], - "requireNativeLibs": [ - "libc.so", - "libdl.so", - "liblog.so", - "libm.so" - ] + "provideNativeLibs": [], + "requireNativeLibs": [] } -- 2.11.0