diff options
| author | 2016-01-21 08:54:26 +0000 | |
|---|---|---|
| committer | 2016-01-21 08:54:26 +0000 | |
| commit | c1d7861e511b8abcc9f3ad6fc54ff07e80dc383e (patch) | |
| tree | a1e7ec449919271138c3c8e179183dc201f4eadf | |
| parent | 6aadaef35ea52506db61e463910c2520b702ca5e (diff) | |
| parent | cc6bb939d00016bfa342fa8cbfc7540b7abc89f2 (diff) | |
Merge "Let Art tests use the default jack version"
| -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 586c80528e..36dd9f4ea7 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -70,6 +70,7 @@ $$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(TARGET_JACK_CLASSPATH_DEPE $(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 @@ $$(run_test_rule_name): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(HOST_OUT_EXECUTABLES 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)) \ |