diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-29 08:06:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 19:33:25 +0000 |
| commit | 2dd6f729c05ff9a6c687888707c68e7894392c38 (patch) | |
| tree | 6b154e83a56431e263a7f7568b89f74d436044ad /test/Android.run-test.mk | |
| parent | 9d2f0100840a41ed6c6c95f92994db7975a8a211 (diff) | |
| parent | 3bb12b9bea020e2b797ec3fe6bc253d33189ed97 (diff) | |
| download | art-2dd6f729c05ff9a6c687888707c68e7894392c38.zip art-2dd6f729c05ff9a6c687888707c68e7894392c38.tar.gz art-2dd6f729c05ff9a6c687888707c68e7894392c38.tar.bz2 | |
Merge "Add a variable to disable PREBUILD in run-tests."
Diffstat (limited to 'test/Android.run-test.mk')
| -rw-r--r-- | test/Android.run-test.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 4fea0fb..d05c9c9 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -365,6 +365,8 @@ define define-test-art-run-test else uc_reloc_type := PREBUILD run_test_options += --relocate --prebuild + ifneq ($(ART_TEST_RUN_TEST_PREBUILD),true) + skip_test := true endif endif endif |