Build only the needed run-test shards with "test.py -b -t XXX"

This should make iteration on a single test much faster.

Note the buildbot-build.sh still does a proper full build,
however that can be disabled with --skip-run-tests-build .

Test: art/test.py -b -r --optimizing -t 001
Change-Id: I3bb261fd81227653426737132a4daefb9e3bbb02

Android.mk

@@ -743,15 +743,22 @@ build-art-unbundled-golem: art-runtime linker oatdump $(art_apex_jars) conscrypt
 
 build-art-host-gtests: build-art-host $(ART_TEST_HOST_GTEST_DEPENDENCIES)
 
-build-art-host-run-tests: build-art-host $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES)
+build-art-host-run-tests: build-art-host \
+                          $(TEST_ART_RUN_TEST_DEPENDENCIES) \
+                          $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) \
+                          art-run-test-host-data \
+                          art-run-test-jvm-data
 
 build-art-host-tests: build-art-host-gtests build-art-host-run-tests
 
 .PHONY: build-art-target-gtests build-art-target-run-tests build-art-target-tests
 
 build-art-target-gtests: build-art-target $(ART_TEST_TARGET_GTEST_DEPENDENCIES)
 
-build-art-target-run-tests: build-art-target $(TEST_ART_RUN_TEST_DEPENDENCIES) $(ART_TEST_TARGET_RUN_TEST_DEPENDENCIES)
+build-art-target-run-tests: build-art-target \
+                            $(TEST_ART_RUN_TEST_DEPENDENCIES) \
+                            $(ART_TEST_TARGET_RUN_TEST_DEPENDENCIES) \
+                            art-run-test-target-data
 
 build-art-target-tests: build-art-target-gtests build-art-target-run-tests
 

test/Android.bp

@@ -1373,33 +1373,6 @@ csuite_test {
     test_config_template: "csuite-app-compile-launch.xml",
 }
 
-// Install run-test data in the output directory.
-prebuilt_etc_host {
-    name: "art-run-test-host-data",
-    defaults: ["art_module_source_build_prebuilt_defaults"],
-    src: ":art-run-test-host-data-merged",
-    sub_dir: "art",
-    filename: "art-run-test-host-data.zip",
-}
-
-// Install run-test data in the output directory.
-prebuilt_etc_host {
-    name: "art-run-test-jvm-data",
-    defaults: ["art_module_source_build_prebuilt_defaults"],
-    src: ":art-run-test-jvm-data-merged",
-    sub_dir: "art",
-    filename: "art-run-test-jvm-data.zip",
-}
-
-// Install run-test data in the output directory.
-prebuilt_etc_host {
-    name: "art-run-test-target-data",
-    defaults: ["art_module_source_build_prebuilt_defaults"],
-    src: ":art-run-test-target-data-merged",
-    sub_dir: "art",
-    filename: "art-run-test-target-data.zip",
-}
-
 filegroup {
     name: "art-gtest-jars",
     srcs: [