diff options
| author | 2015-11-09 12:44:51 +0000 | |
|---|---|---|
| committer | 2015-11-09 12:44:51 +0000 | |
| commit | df7029f2254f67230362c4bdfaddac00c342e660 (patch) | |
| tree | 648d6f7b4b8d693c41d41c408963df1dc5897a94 | |
| parent | 44612873bb02be8a59e16aa50f61cce9e9cc9547 (diff) | |
| parent | a6017d8fa6acfa35f6fad8169162f0e5bd034bc4 (diff) | |
Merge "Revert "Revert "Use Jack lang dev version for compiling art tests"""
| -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 8744674a30..ab1e34e34c 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -71,6 +71,7 @@ $$(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 $$@ @@ -875,6 +876,7 @@ $$(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 $$@ && \ |