diff options
author | Martin Stjernholm <mast@google.com> | 2021-04-06 16:49:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 16:49:30 +0000 |
commit | 0035421ad1430cacf98dde923661edaabc61fcaf (patch) | |
tree | 16553d1b861ffa89165b2bdb702d68467e42c186 /testdata/golden_output/stage2 | |
parent | 3fce22fe9251cc0ebabf085620ff3bbbcc6b79f8 (diff) | |
parent | ac727d87fae9c39e40b18a78059b1a2aa4dadfc5 (diff) | |
download | linkerconfig-0035421ad1430cacf98dde923661edaabc61fcaf.tar.gz |
libdexfile_external is replaced by libdexfile (reland). am: 6d609ffff0 am: ac727d87fatemp_ab_7272582
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1664395
Change-Id: I0b354e18fe82703c3761136ee7b7c010863fe627
Diffstat (limited to 'testdata/golden_output/stage2')
8 files changed, 22 insertions, 22 deletions
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 |