diff options
| author | 2015-11-09 14:25:19 +0000 | |
|---|---|---|
| committer | 2015-11-09 14:25:19 +0000 | |
| commit | ce0f43b97ffb5e4d14c5df6607d8efb46a5dc9d2 (patch) | |
| tree | 92c8cf479f82b3bc8364ddda8a3da90f122b34eb | |
| parent | 31f1584b6bc3fc39dfb396edb24ec42f193f587c (diff) | |
| parent | daf11eb74a40a5a946449b280a2c46a3d422ce8a (diff) | |
Merge "Revert "Revert "Revert "Use Jack lang dev version for compiling art tests""""
| -rw-r--r-- | test/Android.run-test.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index ab1e34e34c..8744674a30 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -71,7 +71,6 @@ $$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(TARGET_JACK_CLASSPATH_DEPE JACK=$(abspath $(JACK)) \ JACK_CLASSPATH=$(TARGET_JACK_CLASSPATH) \ JILL_JAR=$(abspath $(JILL_JAR)) \ - JACK_VERSION=$(JACK_LANG_DEV_VERSION) \ $(LOCAL_PATH)/run-test $$(PRIVATE_RUN_TEST_OPTIONS) --output-path $$(abspath $$(dir $$@)) $(1) $(hide) touch $$@ @@ -876,7 +875,6 @@ $$(run_test_rule_name): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(HOST_OUT_EXECUTABLES JACK=$(abspath $(JACK)) \ JACK_CLASSPATH=$$(PRIVATE_JACK_CLASSPATH) \ JILL_JAR=$(abspath $(JILL_JAR)) \ - JACK_VERSION=$(JACK_LANG_DEV_VERSION) \ art/test/run-test $$(PRIVATE_RUN_TEST_OPTIONS) $(12) \ && $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@) $$(hide) (echo $(MAKECMDGOALS) | grep -q $$@ && \ |