Remove don't bother checks
With the removal of the test runner from the art makefiles,
as well as fixing an unnecessary repetive use of $(shell),
it only takes 300ms to always parse art/Android.mk with tests,
and a 6MB increase in build.ninja (1.5%). Remove art_test_bother,
so that makefiles don't have to be re-read when build art tests.
This will also cause the art tests to build in make checkbuild,
which hasn't been visible in MAKECMDGOALS since the switch to
kati.
art_dont_bother is used for clean-oat to avoid parsing all of the
art Android.mk files, but in practice is more likely to slow things
because it will still need to reread the much larger
out/soong/Android.mk. m clean-oat without art_dont_bother is likely
not going to need to regen at all.
Bug: 26275726
Test: m checkbuild
Test: m clean-oat-host
Test: m test-art-host-run-test-dependencies
Change-Id: I6573fd7ab54a71f90c8bb3bb43a3d872552eeb6d
diff --git a/Android.mk b/Android.mk
index 361ceec..0281b0b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,18 +25,6 @@
include $(art_path)/build/Android.common_path.mk
include $(art_path)/build/Android.oat.mk
-# Following the example of build's dont_bother for clean targets.
-art_dont_bother := false
-ifneq (,$(filter clean-oat%,$(MAKECMDGOALS)))
- art_dont_bother := true
-endif
-
-# Don't bother with tests unless there is a test-art*, build-art*, or related target.
-art_test_bother := false
-ifneq (,$(filter tests test-art% valgrind-test-art% build-art% checkbuild,$(MAKECMDGOALS)))
- art_test_bother := true
-endif
-
.PHONY: clean-oat
clean-oat: clean-oat-host clean-oat-target
@@ -66,8 +54,6 @@
endif
adb shell rm -rf data/run-test/test-*/dalvik-cache/*
-ifneq ($(art_dont_bother),true)
-
########################################################################
# cpplint rules to style check art source files
@@ -103,8 +89,6 @@
########################################################################
# test rules
-ifeq ($(art_test_bother),true)
-
# All the dependencies that must be built ahead of sync-ing them onto the target device.
TEST_ART_TARGET_SYNC_DEPS :=
@@ -348,7 +332,6 @@
valgrind-test-art-target64: valgrind-test-art-target-gtest64
$(hide) $(call ART_TEST_PREREQ_FINISHED,$@)
-endif # art_test_bother
#######################
# Fake packages for ART
@@ -603,11 +586,7 @@
########################################################################
-endif # !art_dont_bother
-
# Clear locally used variables.
-art_dont_bother :=
-art_test_bother :=
TEST_ART_TARGET_SYNC_DEPS :=
# Helper target that depends on boot image creation.