diff options
author | Nikita Ioffe <ioffe@google.com> | 2021-04-01 15:03:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 15:03:23 +0000 |
commit | 715a2d1f2db1897b205fb3d672fec945570cd2d1 (patch) | |
tree | ba1ddcb7800870d4dfdca7ee64adff8b00118a15 /testdata/golden_output/legacy | |
parent | 32141b04f97f71033a951c217408a27e8ea101bf (diff) | |
parent | 06a50e5e80f49203bf764e27668507f5fbcdb5c6 (diff) | |
download | linkerconfig-715a2d1f2db1897b205fb3d672fec945570cd2d1.tar.gz |
Revert "libdexfile_external is replaced by libdexfile." am: 06a50e5e80
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1660246
Change-Id: Ie374f0f6760d78802b9b09c492c0c5f45ea23657
Diffstat (limited to 'testdata/golden_output/legacy')
8 files changed, 16 insertions, 16 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 |