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

7 files changed, 9 insertions, 15 deletions

diff --git a/artd/Android.bp b/artd/Android.bp
index 68a7deae39..ea4de5219f 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -89,7 +89,7 @@ art_cc_defaults {
     ],
 }
 
-// Version of ART gtest `art_artd_tests` bundled with the ART APEX on target.
+// Version of ART gtest `art_artd_tests` for host.
 //
 // This test requires the full libbinder_ndk implementation on host, which is
 // not available as a prebuilt on the thin master-art branch. Hence it won't
@@ -97,6 +97,7 @@ art_cc_defaults {
 // test-art-host-gtest.
 art_cc_test {
     name: "art_artd_tests",
+    device_supported: false,
     defaults: [
         "art_gtest_defaults",
         "art_artd_tests_defaults",
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 03906b287d..58cf89a4a3 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -114,8 +114,6 @@ ART_TEST_MODULES_COMMON := \
     art_imgdiag_tests \
     art_libartbase_tests \
     art_libartpalette_tests \
-    art_libartservice_tests \
-    art_libarttools_tests \
     art_libdexfile_external_tests \
     art_libdexfile_support_static_tests \
     art_libdexfile_support_tests \
@@ -133,10 +131,11 @@ ifeq (,$(SANITIZE_HOST))
 endif
 
 ART_TEST_MODULES_TARGET := $(ART_TEST_MODULES_COMMON) \
-    art_artd_tests \
     art_odrefresh_tests \
 
-ART_TEST_MODULES_HOST := $(ART_TEST_MODULES_COMMON)
+ART_TEST_MODULES_HOST := $(ART_TEST_MODULES_COMMON) \
+    art_libartservice_tests \
+    art_libarttools_tests \
 
 ifneq (,$(wildcard frameworks/native/libs/binder))
   # Only include the artd host tests if we have the binder sources available and
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f4d3d5a6c5..690ee4f7f5 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -360,9 +360,6 @@ art_gtests = [
 
 // ART gtests for which the "first" version is preferred.
 art_gtests_first = [
-    "art_artd_tests",
-    "art_libartservice_tests",
-    "art_libarttools_tests",
     "art_odrefresh_tests",
 ]
 
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')
diff --git a/libartservice/service/Android.bp b/libartservice/service/Android.bp
index afc69e4264..62bdda9edd 100644
--- a/libartservice/service/Android.bp
+++ b/libartservice/service/Android.bp
@@ -208,10 +208,11 @@ art_cc_defaults {
     ],
 }
 
-// Version of ART gtest `art_libartservice_tests` bundled with the ART APEX on target.
+// Version of ART gtest `art_libartservice_tests` for host.
 // TODO(b/192274705): Remove this module when the migration to standalone ART gtests is complete.
 art_cc_test {
     name: "art_libartservice_tests",
+    device_supported: false,
     defaults: [
         "art_gtest_defaults",
         "art_libartservice_tests_defaults",
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
index b946f06c2b..e82ce0c403 100644
--- a/libarttools/Android.bp
+++ b/libarttools/Android.bp
@@ -94,10 +94,11 @@ art_cc_defaults {
     },
 }
 
-// Version of ART gtest `art_libarttools_tests` bundled with the ART APEX on target.
+// Version of ART gtest `art_libarttools_tests` bundled for host.
 // TODO(b/192274705): Remove this module when the migration to standalone ART gtests is complete.
 art_cc_test {
     name: "art_libarttools_tests",
+    device_supported: false,
     defaults: [
         "art_gtest_defaults",
         "art_libarttools_tests_defaults",
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 897f48d0a2..eb95d350c4 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -181,8 +181,6 @@ if [[ $build_target == "yes" ]]; then
   make_command+=" deapexer"
   # Needed to generate the primary boot image for testing.
   make_command+=" generate-boot-image"
-  # Data file needed by the `ArtExecTest.SetTaskProfiles` test.
-  make_command+=" task_profiles.json"
   # Build/install the required APEXes.
   make_command+=" ${apexes[*]}"
   make_command+=" ${specific_targets}"