Add a variable to disable PREBUILD in run-tests.
Change-Id: I318d37a2d98972c689829258e129ec8973bdc038
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index 1967968..59536e2 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -78,6 +78,9 @@
# Do you want run-tests with prebuild disabled?
ART_TEST_RUN_TEST_NO_PREBUILD ?= $(ART_TEST_FULL)
+# Do you want run-tests with prebuild enabled?
+ART_TEST_RUN_TEST_PREBUILD ?= true
+
# Define the command run on test failure. $(1) is the name of the test. Executed by the shell.
define ART_TEST_FAILED
( [ -f $(ART_HOST_TEST_DIR)/skipped/$(1) ] || \
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 6fa5df1..3d03b89 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -393,6 +393,8 @@
else
uc_reloc_type := PREBUILD
run_test_options += --relocate --prebuild
+ ifneq ($(ART_TEST_RUN_TEST_PREBUILD),true)
+ skip_test := true
endif
endif
endif