Skip make targets that have missing dependencies when using ART
prebuilts.
This is necessary because ART sources can still be in the tree when
prebuilts are used, and e.g. for host we don't have a boot image in
them.
Test: m checkbuild
with and without SOONG_CONFIG_art_module_source_build=false, check
that it passes the "Test for dangling rules" stage
Bug: 172480615
Change-Id: I4f24a430d1b11202eb4dceeedc96a0906679830e
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 8698e71..5480860 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -94,13 +94,17 @@
endif
-test-art-host-run-test-dependencies : \
+ifeq (true,$(my_art_module_source_build))
+ test-art-host-run-test-dependencies : \
$(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) $(TEST_ART_RUN_TEST_DEPENDENCIES) \
$(HOST_BOOT_IMAGE_JARS) $(HOST_BOOT_IMAGE) $(2ND_HOST_BOOT_IMAGE)
-.PHONY: test-art-host-run-test-dependencies
+ .PHONY: test-art-host-run-test-dependencies
+ test-art-run-test-dependencies : test-art-host-run-test-dependencies
+endif
+
test-art-target-run-test-dependencies :
.PHONY: test-art-target-run-test-dependencies
-test-art-run-test-dependencies : test-art-host-run-test-dependencies test-art-target-run-test-dependencies
+test-art-run-test-dependencies : test-art-target-run-test-dependencies
.PHONY: test-art-run-test-dependencies
# Create a rule to build and run a test group of the following form:
@@ -114,16 +118,15 @@
./art/test/testrunner/testrunner.py $$(args)
build_target :=
args :=
+
+ test-art-run-test : $(build_target)
endef # define-test-art-host-or-target-run-test-group
-TARGET_TYPES := host target
-$(foreach target, $(TARGET_TYPES), $(eval \
- $(call define-test-art-host-or-target-run-test-group,$(target))))
+$(eval $(call define-test-art-host-or-target-run-test-group,target))
-test-art-run-test : test-art-host-run-test test-art-target-run-test
+ifeq (true,$(my_art_module_source_build))
+ $(eval $(call define-test-art-host-or-target-run-test-group,host))
+endif
-host_prereq_rules :=
-core-image-dependencies :=
define-test-art-host-or-target-run-test-group :=
-TARGET_TYPES :=
LOCAL_PATH :=