From 1bf57ac401ec6be9ce13a4dbe29e758b135f2ab0 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 20 Aug 2024 13:06:52 +0000 Subject: Revert^2 "Remove ART Service tests from chroot tests." This reverts commit 73a49cd990a10d7e21d41be001170e72e6ba3d49. Reason for revert: Problem fixed For target tests that are included in the ART testing apex, Soong generates Make modules to build them for the apex. After removing target tests from the ART testing apex, Soong starts to generate Make modules to build them at $ANDROID_PRODUCT_OUT/testcases, and art-host-tests.mk unexpectedly picks them up from there and packs them into art-host-tests.zip. Adding `device_supported: false` solves the problem. A follow up change will be made to stop art-host-tests.mk from packing target tests into art-host-tests.zip. Bug: 357802879 Bug: 356793689 Bug: 360150490 Test: art/test/README.chroot.md Change-Id: I05adfbc6ea633640a040cfdc0527effa6ef01cab --- build/apex/art_apex_test.py | 3 --- 1 file changed, 3 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 d435cd77ef..86059255a2 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -710,7 +710,6 @@ class TestingTargetChecker: self._checker.check_dir(arch_dir) # Check ART test binaries. - self._checker.check_art_test_executable('art_artd_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_cmdline_tests') self._checker.check_art_test_executable('art_compiler_tests') self._checker.check_art_test_executable('art_dex2oat_tests') @@ -722,8 +721,6 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_imgdiag_tests') self._checker.check_art_test_executable('art_libartbase_tests') self._checker.check_art_test_executable('art_libartpalette_tests') - self._checker.check_art_test_executable('art_libartservice_tests', MULTILIB_FIRST) - self._checker.check_art_test_executable('art_libarttools_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_libdexfile_support_tests') self._checker.check_art_test_executable('art_libdexfile_tests') self._checker.check_art_test_executable('art_libprofile_tests') -- cgit v1.2.3-59-g8ed1b