Revert "libdexfile_external is replaced by libdexfile." am: 06a50e5e80 am: 715a2d1f2d

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1660246

Change-Id: I92d271709998fd06f7454cea4370cc5cb01e74d6

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 cb7529c..b40adf8 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 ab2dfca..68f9d52 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 8d70daf..1d54adc 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 e819d0d..ca23993 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 802274a..ad86365 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 44e2c06..4dbe3dc 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 87d5b16..e88364a 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
diff --git a/testdata/golden_output/legacy/ld.config.txt b/testdata/golden_output/legacy/ld.config.txt
index b5a99ce..1babece 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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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 e977f53..4673350 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 c91afd4..992a5f0 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 5575f54..f3c3fba 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 1937aae..8bb0042 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 2891182..7457aac 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 fba7065..e64da9a 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 affbf53..6db95c8 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
diff --git a/testdata/golden_output/product-enabled/ld.config.txt b/testdata/golden_output/product-enabled/ld.config.txt
index da929c1..29b2dec 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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
@@ -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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
@@ -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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 1a0dcd2..2230e3d 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 24c1561..2921f52 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt
index 3cb7654..15190ce 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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
@@ -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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 cb7529c..b40adf8 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 ab2dfca..68f9d52 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 8d70daf..1d54adc 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 6cbb24d..afcbc59 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 802274a..ad86365 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 44e2c06..4dbe3dc 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 dbd4f0f..83b6e8e 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt
index 38867ed..f81da15 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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
@@ -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.so
-namespace.default.link.com_android_art.shared_libs += libdexfiled.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 += 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.so
-namespace.system.link.com_android_art.shared_libs += libdexfiled.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
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 3b17152..128e7ba 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.so",
-    "libdexfiled.so",
+    "libdexfile_external.so",
+    "libdexfiled_external.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 e99aad0..367cbee 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.so",
-    "libdexfiled.so",
+    "libdexfile_external.so",
+    "libdexfiled_external.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