ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars
Change-Id: I8db60eade0338e53e76a87ef38ad661550475e3c
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index c50b4ae..1ec0c76 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -48,7 +48,7 @@
ART_TEST_KNOWN_FAILING :=
# Keep going after encountering a test failure?
-ART_TEST_KEEP_GOING ?= false
+ART_TEST_KEEP_GOING ?= true
# Do you want all tests, even those that are time consuming?
ART_TEST_FULL ?= true
@@ -65,12 +65,6 @@
# Do you want tests with the GC stress mode enabled run?
ART_TEST_GC_STRESS ?= $(ART_TEST_FULL)
-# Do you want oat tests with relocation enabled?
-ART_TEST_OAT_RELOCATE ?= true
-
-# Do you want oat tests with relocation disabled?
-ART_TEST_OAT_NO_RELOCATE ?= $(ART_TEST_FULL)
-
# Do you want run-tests with relocation enabled?
ART_TEST_RUN_TEST_RELOCATE ?= $(ART_TEST_FULL)
