Revert "Revert "Use Jack lang dev version for compiling art tests""

This reverts commit a5a79b6607471371bb80ff8fee36dbf05c807ee5.

Change-Id: Ie890882c1c344099fbf58abce022b2815e809e78

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 8744674..ab1e34e 100644 (file)
--- 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 $$@ && \