From 698370e93377b90faac5d6720442e26ac8ada78f Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Thu, 1 Apr 2021 10:58:24 +0000 Subject: [PATCH] Revert "libdexfile_external is being replaced by libdexfile." Revert "Merge libdexfile_external into libdexfile." 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: I2448810c9a863cde32b6ed98d9ed0a99cf260d34 --- rootdir/etc/linker.config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json index d9f552651..83cb6ff13 100644 --- a/rootdir/etc/linker.config.json +++ b/rootdir/etc/linker.config.json @@ -1,7 +1,8 @@ { "requireLibs": [ - "libdexfile.so", - "libdexfiled.so", + // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. + "libdexfile_external.so", + "libdexfiled_external.so", "libnativebridge.so", "libnativehelper.so", "libnativeloader.so",