From 06a50e5e80f49203bf764e27668507f5fbcdb5c6 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Thu, 1 Apr 2021 10:58:24 +0000 Subject: Revert "libdexfile_external is replaced by libdexfile." Revert "Rename libdexfile_external_static to libdexfile_static." Revert "Rename libdexfile_external_static to libdexfile_static." Revert "Allow dependencies from platform variants to APEX modules." Revert submission 1658000 Reason for revert: Breaks full-eng build: b/184239856 Reverted Changes: I4f8ead785:Avoid internal APEX stubs for libsigchain and clea... I68affdf69:Allow dependencies from platform variants to APEX ... I54b33784e:Rename libdexfile_external_static to libdexfile_st... Id68ae9438:libdexfile_external is being replaced by libdexfil... I12ac84eb4:libdexfile_external is replaced by libdexfile. If05dbffc8:Rename libdexfile_external_static to libdexfile_st... Ia011fa3a8:Merge libdexfile_external into libdexfile. Change-Id: Iab9f8b5b839eb0c3ade2019bf7af579cccae81d9 --- testdata/golden_output/legacy/com.android.runtime/ld.config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testdata/golden_output/legacy/com.android.runtime/ld.config.txt') 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 -- cgit v1.2.3