diff options
| author | 2017-04-10 19:04:59 -0700 | |
|---|---|---|
| committer | 2017-04-11 16:32:45 +0000 | |
| commit | b6f707cb725db79bdcd6a1d160f11d2be60f9bf0 (patch) | |
| tree | 326a36db72a5ba6a9fdb2934663f18147684647d | |
| parent | 8aaa601d88660d4653d64ea822197e72a43bf768 (diff) | |
Don't add Jack dependencies when building without Jack
Runtests add dependencies on the core library classes.jack files,
which don't exist when compiling with javac. Disable the dependencies
when building without Jack for now.
Test: m -j ANDROID_COMPILE_WITH_JACK=false tests
Change-Id: I40925c8c8536cc048e7308e6202db420154a18aa
| -rw-r--r-- | test/Android.run-test.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 187b383b14..ece57622fc 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -53,7 +53,11 @@ define define-build-art-run-test run_test_options += --quiet endif $$(dmart_target): PRIVATE_RUN_TEST_OPTIONS := $$(run_test_options) -$$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) $(TARGET_JACK_CLASSPATH_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES) +$$(dmart_target): $(TEST_ART_RUN_TEST_DEPENDENCIES) | $(TEST_ART_RUN_TEST_ORDERONLY_DEPENDENCIES) +ifeq ($(ANDROID_COMPILE_WITH_JACK),true) +$$(dmart_target): $(TARGET_JACK_CLASSPATH_DEPENDENCIES) +endif +$$(dmart_target): $(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@) $(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \ SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \ @@ -172,14 +176,18 @@ endif # Host executables. host_prereq_rules := $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES) +ifeq ($(ANDROID_COMPILE_WITH_JACK),true) # Classpath for Jack compilation for host. host_prereq_rules += $(HOST_JACK_CLASSPATH_DEPENDENCIES) +endif # Required for dx, jasmin, smali, dexmerger, jack. host_prereq_rules += $(TEST_ART_RUN_TEST_DEPENDENCIES) +ifeq ($(ANDROID_COMPILE_WITH_JACK),true) # Classpath for Jack compilation for target. target_prereq_rules := $(TARGET_JACK_CLASSPATH_DEPENDENCIES) +endif # Sync test files to the target, depends upon all things that must be pushed #to the target. |