From 663eb13beff99ddf4bf1f0c4be70a8b045ef5e07 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 7 Jun 2024 18:46:06 +0100 Subject: Remove the dexlayout library from the APEX. Also remove the dexlayout(d) and dexdiag binaries from the debug APEX and the art-tools mk module. Also remove references to the dexlayout-related gtests. Test: art/tools/buildbot-build.sh Test: art/build/apex/runtests.sh Bug: 325430813 Change-Id: I6a6cbc0eecfedf3e020eb1c9e4d4f1479cf4a6dc --- build/apex/art_apex_test.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 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 05cc1a6314..ff98d961fa 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -475,7 +475,6 @@ class ReleaseChecker: # Check internal libraries for ART. self._checker.check_native_library('libadbconnection') self._checker.check_native_library('libart') - self._checker.check_native_library('libart-dexlayout') self._checker.check_native_library('libart-disassembler') self._checker.check_native_library('libartbase') self._checker.check_native_library('libartpalette') @@ -603,13 +602,10 @@ class DebugChecker: def run(self): # Check binaries for ART. - self._checker.check_executable('dexdiag') self._checker.check_executable('dexanalyze') - self._checker.check_executable('dexlayout') self._checker.check_symlinked_multilib_executable('imgdiag') # Check debug binaries for ART. - self._checker.check_executable('dexlayoutd') self._checker.check_executable('dexoptanalyzerd') self._checker.check_symlinked_multilib_executable('imgdiagd') self._checker.check_executable('profmand') @@ -621,7 +617,6 @@ class DebugChecker: self._checker.check_native_library('libadbconnectiond') self._checker.check_native_library('libartbased') self._checker.check_native_library('libartd') - self._checker.check_native_library('libartd-dexlayout') self._checker.check_native_library('libartd-disassembler') self._checker.check_native_library('libopenjdkjvmd') self._checker.check_native_library('libopenjdkjvmtid') @@ -659,8 +654,8 @@ class DebugTargetChecker: # double_loadable:true, cf. go/double_loadable). Also, like in the release # package we need to look out for dependencies that should go through # exported library stubs (until b/128708192 is fixed). - self._checker.check_prefer64_library('libmeminfo') - self._checker.check_prefer64_library('libprocinfo') + # + # (There are currently no debug-only native libraries.) class TestingTargetChecker: @@ -677,9 +672,7 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_compiler_tests') self._checker.check_art_test_executable('art_dex2oat_tests') self._checker.check_art_test_executable('art_dexanalyze_tests') - self._checker.check_art_test_executable('art_dexdiag_tests') self._checker.check_art_test_executable('art_dexdump_tests') - self._checker.check_art_test_executable('art_dexlayout_tests') self._checker.check_art_test_executable('art_dexlist_tests') self._checker.check_art_test_executable('art_dexoptanalyzer_tests') self._checker.check_art_test_executable('art_disassembler_tests') -- cgit v1.2.3-59-g8ed1b