diff options
| author | 2017-11-16 09:17:38 +0000 | |
|---|---|---|
| committer | 2017-11-16 09:17:38 +0000 | |
| commit | 41af72b579293bce40bae48967e36a2762cefc64 (patch) | |
| tree | ea0a4d804fe7f84ca7eeadbc1e461bb07b878e8d | |
| parent | 134b52b944519cf1637e29084dae68d0c98f5ea0 (diff) | |
| parent | a4ba9b53d8c102369a316c93ff14eaa488493435 (diff) | |
Merge "Rename d8 to d8-compat-dx"
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 2 | ||||
| -rwxr-xr-x | test/etc/default-build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 42d0ba57cf..3c8eade773 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -608,7 +608,7 @@ define define-test-art-gtest-combination endif .PHONY: $$(rule_name) -$$(rule_name): $$(dependencies) dx d8 +$$(rule_name): $$(dependencies) dx d8-compat-dx $(hide) $$(call ART_TEST_PREREQ_FINISHED,$$@) # Clear locally defined variables. diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 8755f04320..fe4a327a1f 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -27,7 +27,7 @@ TEST_ART_RUN_TEST_DEPENDENCIES := \ # Add d8 dependency, if enabled. ifeq ($(USE_D8),true) TEST_ART_RUN_TEST_DEPENDENCIES += \ - $(HOST_OUT_EXECUTABLES)/d8 + $(HOST_OUT_EXECUTABLES)/d8-compat-dx endif # Convert's a rule name to the form used in variables, e.g. no-relocate to NO_RELOCATE diff --git a/test/etc/default-build b/test/etc/default-build index f14424ecf9..5c8257f210 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -294,7 +294,7 @@ function make_dex() { local dexer="${DX}" if [ ${USE_D8} = "true" ]; then - dexer="${ANDROID_HOST_OUT}/bin/d8" + dexer="${ANDROID_HOST_OUT}/bin/d8-compat-dx" fi # Make dex file from desugared JAR. |