From 9cfeb70f970eaced5d7e712c25674dad10f7164f Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Fri, 9 Apr 2021 11:35:11 +0000 Subject: [PATCH] Revert "libdexfile_external is replaced by libdexfile (reland)." Revert "Merge libdexfile_external into libdexfile (reland)." Revert "Rename libdexfile_external_static to libdexfile_static (..." Revert "Rename libdexfile_external_static to libdexfile_static (..." Revert submission 1666119-libdexfile-noext-2 Reason for revert: broken build 7270939 on aosp-master on full-eng Reverted Changes: I582e49ae7:Merge libdexfile_external into libdexfile (reland)... Iaa6a90f41:Rename libdexfile_external_static to libdexfile_st... I4315189b2:libdexfile_external is replaced by libdexfile (rel... Ia065119c2:Rename libdexfile_external_static to libdexfile_st... Bug: 184929782 Change-Id: Id4830ded68e6fb3e9da0bcd8e428c46a79df3ff8 Test: forrest build for aosp-master on full-eng --- 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",