Revert "Revert "Remove don't bother checks""
This reverts commit 04ccfaf7ab311dc10dbce435690c1cea5e492a9e.
Change-Id: I312ffefbef428998516dbf646d2f13c8c3086a4c
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.