commit a5a79b6607471371bb80ff8fee36dbf05c807ee5
author Nicolas Geoffray <ngeoffray@google.com> Thu Nov 05 09:18:55 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Nov 05 09:20:27 2015 +0000
tree ee1ea3271d41b9a647a7ce7e4d1a0ed94eff9fcf
parent 55fed87ff8b60d55589ee7df75b5080b17bce541

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

Tests fail.

This reverts commit 55fed87ff8b60d55589ee7df75b5080b17bce541.

Change-Id: I02c064c6774d72bc1349dbaab4d05ef69c537952

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index ab1e34e..8744674 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -71,7 +71,6 @@
 	  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 @@
 	    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 $$@ && \