commit cc6bb939d00016bfa342fa8cbfc7540b7abc89f2
author Yohann Roussel <yroussel@google.com> Tue Jan 19 23:29:29 2016 +0100
committer Yohann Roussel <yroussel@google.com> Wed Jan 20 18:18:47 2016 +0100
tree 44f22b2ce58f2bf410a32061194f9dcb70cacaf7
parent c4004042ca028a3c7898f0032dcee08cddea303b

Let Art tests use the default jack version

(cherry picked from commit 261cf1b14a06c86e4a19972eabb5b43bc82bb717)

Change-Id: I7184a752b067e59fc28804cba92df62e713a0785

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 586c805..36dd9f4 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -70,6 +70,7 @@
 	$(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \
 	  SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \
 	  DXMERGER=$(abspath $(HOST_OUT_EXECUTABLES)/dexmerger) \
+	  JACK_VERSION=$(JACK_DEFAULT_VERSION) \
 	  JACK=$(abspath $(JACK)) \
 	  JACK_CLASSPATH=$(TARGET_JACK_CLASSPATH) \
 	  JILL_JAR=$(abspath $(JILL_JAR)) \
@@ -967,6 +968,7 @@
 	    JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \
 	    SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \
 	    DXMERGER=$(abspath $(HOST_OUT_EXECUTABLES)/dexmerger) \
+	    JACK_VERSION=$(JACK_DEFAULT_VERSION) \
 	    JACK=$(abspath $(JACK)) \
 	    JACK_CLASSPATH=$$(PRIVATE_JACK_CLASSPATH) \
 	    JILL_JAR=$(abspath $(JILL_JAR)) \