From 6d609ffff05146c0398ce848d46e4648db24a226 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 18 Mar 2021 03:13:52 +0000 Subject: libdexfile_external is replaced by libdexfile (reland). Only update the test data to avoid confusing discrepancy. This relands https://r.android.com/1643427 after decoupling it from the topic that caused b/184239856. Test: system/linkerconfig/rundiff.sh Bug: 143978909 Change-Id: I1ca20568a77c4487e815bbfa32f108964bed00a4 --- .../legacy/com.android.adbd/ld.config.txt | 4 ++-- .../legacy/com.android.art/ld.config.txt | 4 ++-- .../legacy/com.android.conscrypt/ld.config.txt | 4 ++-- .../legacy/com.android.media.swcodec/ld.config.txt | 4 ++-- .../legacy/com.android.runtime/ld.config.txt | 4 ++-- .../legacy/com.android.sdkext/ld.config.txt | 4 ++-- .../legacy/com.vendor.service1/ld.config.txt | 4 ++-- testdata/golden_output/legacy/ld.config.txt | 4 ++-- .../product-enabled/com.android.adbd/ld.config.txt | 4 ++-- .../product-enabled/com.android.art/ld.config.txt | 4 ++-- .../com.android.conscrypt/ld.config.txt | 4 ++-- .../com.android.media.swcodec/ld.config.txt | 4 ++-- .../com.android.runtime/ld.config.txt | 4 ++-- .../product-enabled/com.android.sdkext/ld.config.txt | 4 ++-- .../com.vendor.service1/ld.config.txt | 4 ++-- testdata/golden_output/product-enabled/ld.config.txt | 20 ++++++++++---------- .../stage1/com.android.art/ld.config.txt | 4 ++-- .../stage1/com.android.runtime/ld.config.txt | 4 ++-- testdata/golden_output/stage1/ld.config.txt | 16 ++++++++-------- .../stage2/com.android.adbd/ld.config.txt | 4 ++-- .../stage2/com.android.art/ld.config.txt | 4 ++-- .../stage2/com.android.conscrypt/ld.config.txt | 4 ++-- .../stage2/com.android.media.swcodec/ld.config.txt | 4 ++-- .../stage2/com.android.runtime/ld.config.txt | 4 ++-- .../stage2/com.android.sdkext/ld.config.txt | 4 ++-- .../stage2/com.vendor.service1/ld.config.txt | 4 ++-- testdata/golden_output/stage2/ld.config.txt | 16 ++++++++-------- .../system/apex/com.android.art/apex_manifest.json | 4 ++-- testdata/root/system/etc/linker.config.json | 6 +++--- 29 files changed, 79 insertions(+), 79 deletions(-) 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 b40adf8..cb7529c 100644 --- a/testdata/golden_output/legacy/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.adbd/ld.config.txt @@ -183,8 +183,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 68f9d52..ab2dfca 100644 --- a/testdata/golden_output/legacy/com.android.art/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.art/ld.config.txt @@ -231,8 +231,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 1d54adc..8d70daf 100644 --- a/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt @@ -202,8 +202,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 ca23993..e819d0d 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 @@ -241,8 +241,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 ad86365..802274a 100644 --- a/testdata/golden_output/legacy/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.runtime/ld.config.txt @@ -192,8 +192,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 4dbe3dc..44e2c06 100644 --- a/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt @@ -197,8 +197,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/legacy/com.vendor.service1/ld.config.txt b/testdata/golden_output/legacy/com.vendor.service1/ld.config.txt index e88364a..87d5b16 100644 --- a/testdata/golden_output/legacy/com.vendor.service1/ld.config.txt +++ b/testdata/golden_output/legacy/com.vendor.service1/ld.config.txt @@ -202,8 +202,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/legacy/ld.config.txt b/testdata/golden_output/legacy/ld.config.txt index 1babece..b5a99ce 100644 --- a/testdata/golden_output/legacy/ld.config.txt +++ b/testdata/golden_output/legacy/ld.config.txt @@ -31,8 +31,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 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 4673350..e977f53 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 @@ -180,8 +180,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 992a5f0..c91afd4 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 @@ -228,8 +228,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 f3c3fba..5575f54 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 @@ -199,8 +199,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 8bb0042..1937aae 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 @@ -234,8 +234,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 7457aac..2891182 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 @@ -189,8 +189,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 e64da9a..fba7065 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 @@ -194,8 +194,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/product-enabled/com.vendor.service1/ld.config.txt b/testdata/golden_output/product-enabled/com.vendor.service1/ld.config.txt index 6db95c8..affbf53 100644 --- a/testdata/golden_output/product-enabled/com.vendor.service1/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.vendor.service1/ld.config.txt @@ -201,8 +201,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/product-enabled/ld.config.txt b/testdata/golden_output/product-enabled/ld.config.txt index 29b2dec..da929c1 100644 --- a/testdata/golden_output/product-enabled/ld.config.txt +++ b/testdata/golden_output/product-enabled/ld.config.txt @@ -119,8 +119,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -678,8 +678,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 @@ -914,8 +914,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 @@ -968,8 +968,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -1532,8 +1532,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 2230e3d..1a0dcd2 100644 --- a/testdata/golden_output/stage1/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage1/com.android.art/ld.config.txt @@ -83,8 +83,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 2921f52..24c1561 100644 --- a/testdata/golden_output/stage1/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage1/com.android.runtime/ld.config.txt @@ -87,8 +87,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt index 15190ce..3cb7654 100644 --- a/testdata/golden_output/stage1/ld.config.txt +++ b/testdata/golden_output/stage1/ld.config.txt @@ -125,8 +125,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -408,8 +408,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 @@ -466,8 +466,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -732,8 +732,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 b40adf8..cb7529c 100644 --- a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt @@ -183,8 +183,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 68f9d52..ab2dfca 100644 --- a/testdata/golden_output/stage2/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.art/ld.config.txt @@ -231,8 +231,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 1d54adc..8d70daf 100644 --- a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt @@ -202,8 +202,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 afcbc59..6cbb24d 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 @@ -237,8 +237,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 ad86365..802274a 100644 --- a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt @@ -192,8 +192,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 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 4dbe3dc..44e2c06 100644 --- a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt @@ -197,8 +197,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/stage2/com.vendor.service1/ld.config.txt b/testdata/golden_output/stage2/com.vendor.service1/ld.config.txt index 83b6e8e..dbd4f0f 100644 --- a/testdata/golden_output/stage2/com.vendor.service1/ld.config.txt +++ b/testdata/golden_output/stage2/com.vendor.service1/ld.config.txt @@ -204,8 +204,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt index f81da15..38867ed 100644 --- a/testdata/golden_output/stage2/ld.config.txt +++ b/testdata/golden_output/stage2/ld.config.txt @@ -125,8 +125,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -669,8 +669,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 @@ -732,8 +732,8 @@ namespace.default.link.com_android_i18n.shared_libs += libicu.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.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.default.link.com_android_art.shared_libs = libdexfile.so +namespace.default.link.com_android_art.shared_libs += libdexfiled.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 @@ -1299,8 +1299,8 @@ namespace.system.link.com_android_i18n.shared_libs += libicu.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_i18n.shared_libs += libpac.so -namespace.system.link.com_android_art.shared_libs = libdexfile_external.so -namespace.system.link.com_android_art.shared_libs += libdexfiled_external.so +namespace.system.link.com_android_art.shared_libs = libdexfile.so +namespace.system.link.com_android_art.shared_libs += libdexfiled.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 diff --git a/testdata/root/system/apex/com.android.art/apex_manifest.json b/testdata/root/system/apex/com.android.art/apex_manifest.json index 128e7ba..3b17152 100644 --- a/testdata/root/system/apex/com.android.art/apex_manifest.json +++ b/testdata/root/system/apex/com.android.art/apex_manifest.json @@ -3,8 +3,8 @@ "version": 1, "provideNativeLibs": [ "libandroidio.so", - "libdexfile_external.so", - "libdexfiled_external.so", + "libdexfile.so", + "libdexfiled.so", "libnativebridge.so", "libnativehelper.so", "libnativeloader.so" diff --git a/testdata/root/system/etc/linker.config.json b/testdata/root/system/etc/linker.config.json index 367cbee..e99aad0 100644 --- a/testdata/root/system/etc/linker.config.json +++ b/testdata/root/system/etc/linker.config.json @@ -32,8 +32,8 @@ "libselinux.so" ], "requireLibs": [ - "libdexfile_external.so", - "libdexfiled_external.so", + "libdexfile.so", + "libdexfiled.so", "libnativebridge.so", "libnativehelper.so", "libnativeloader.so", @@ -50,4 +50,4 @@ "libadb_pairing_connection.so", "libadb_pairing_server.so" ] -} \ No newline at end of file +} -- cgit v1.2.3