diff options
| author | 2015-11-09 14:00:28 +0000 | |
|---|---|---|
| committer | 2015-11-09 14:00:28 +0000 | |
| commit | daf11eb74a40a5a946449b280a2c46a3d422ce8a (patch) | |
| tree | ee1ea3271d41b9a647a7ce7e4d1a0ed94eff9fcf | |
| parent | a6017d8fa6acfa35f6fad8169162f0e5bd034bc4 (diff) | |
Revert "Revert "Revert "Use Jack lang dev version for compiling art tests"""
Breaks 962 and 963 run-tests.
This reverts commit a6017d8fa6acfa35f6fad8169162f0e5bd034bc4.
Change-Id: I185e803640309f0055e6a3d767da201527b523e2
| -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 $$@ && \ |