From f442a84ca02002cd52aebdc724d84de9e8f2dd36 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Thu, 1 Apr 2021 10:58:24 +0000 Subject: 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: I9064dd8debe2f385782c8cc6c1830e4cc5cb7221 --- build/apex/art_apex_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/apex/art_apex_test.py') diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index 30f8e1f05f..91af3db510 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -527,7 +527,7 @@ class ReleaseChecker: self._checker.check_symlinked_multilib_executable('dalvikvm') # Check exported libraries for ART. - self._checker.check_native_library('libdexfile') + self._checker.check_native_library('libdexfile_external') self._checker.check_native_library('libnativebridge') self._checker.check_native_library('libnativehelper') self._checker.check_native_library('libnativeloader') @@ -542,6 +542,7 @@ class ReleaseChecker: self._checker.check_native_library('libartpalette') self._checker.check_native_library('libartservice') self._checker.check_native_library('libarttools') + self._checker.check_native_library('libdexfile') self._checker.check_native_library('libdexfile_support') self._checker.check_native_library('libdt_fd_forward') self._checker.check_native_library('libopenjdkjvm') @@ -676,9 +677,6 @@ class DebugChecker: self._checker.check_symlinked_multilib_executable('imgdiagd') self._checker.check_executable('profmand') - # Check exported libraries for ART. - self._checker.check_native_library('libdexfiled') - # Check internal libraries for ART. self._checker.check_native_library('libadbconnectiond') self._checker.check_native_library('libartbased') @@ -686,6 +684,7 @@ class DebugChecker: self._checker.check_native_library('libartd-compiler') self._checker.check_native_library('libartd-dexlayout') self._checker.check_native_library('libartd-disassembler') + self._checker.check_native_library('libdexfiled') self._checker.check_native_library('libopenjdkjvmd') self._checker.check_native_library('libopenjdkjvmtid') self._checker.check_native_library('libprofiled') @@ -708,6 +707,7 @@ class DebugTargetChecker: self._checker.check_executable('oatdumpd') # Check ART internal libraries. + self._checker.check_native_library('libdexfiled_external') self._checker.check_native_library('libperfetto_hprofd') # Check internal native library dependencies. -- cgit v1.2.3-59-g8ed1b