Replace DX flag by D8.

Bug: b/227746536
Test: run_build_test_target.py -j80 art-test
Change-Id: Iae839a0fded0e613157b0cc4ad311c075a331216

5 files changed, 8 insertions, 8 deletions

diff --git a/Android.mk b/Android.mk
index 9257c22912..15c7989fea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -882,7 +882,7 @@ endef
 define create_public_sdk_dex
 public_sdk_$(1)_stub := $$(call get_public_sdk_stub_dex,$(1))
 $$(public_sdk_$(1)_stub): PRIVATE_MIN_SDK_VERSION := $(1)
-$$(public_sdk_$(1)_stub): $$(call resolve-prebuilt-sdk-jar-path,$(1)) $$(DX) $$(ZIP2ZIP)
+$$(public_sdk_$(1)_stub): $$(call resolve-prebuilt-sdk-jar-path,$(1)) $$(D8) $$(ZIP2ZIP)
 	$$(transform-classes.jar-to-dex)
 
 $$(call declare-1p-target,$$(public_sdk_$(1)_stub),art)
diff --git a/test/testrunner/env.py b/test/testrunner/env.py
index 319e1a76b0..d5e0543721 100644
--- a/test/testrunner/env.py
+++ b/test/testrunner/env.py
@@ -132,8 +132,8 @@ else:
 HOST_OUT_EXECUTABLES = os.path.join(ANDROID_BUILD_TOP,
                                     _get_build_var("HOST_OUT_EXECUTABLES"))
 
-# Set up default values for $DX, $SMALI, etc to the $HOST_OUT_EXECUTABLES/$name path.
-for tool in ['dx', 'smali', 'jasmin', 'd8']:
+# Set up default values for $D8, $SMALI, etc to the $HOST_OUT_EXECUTABLES/$name path.
+for tool in ['smali', 'jasmin', 'd8']:
   os.environ.setdefault(tool.upper(), HOST_OUT_EXECUTABLES + '/' + tool)
 
 ANDROID_JAVA_TOOLCHAIN = os.path.join(ANDROID_BUILD_TOP,
diff --git a/test/testrunner/run_build_test_target.py b/test/testrunner/run_build_test_target.py
index 4191771d0d..2e4e91a776 100755
--- a/test/testrunner/run_build_test_target.py
+++ b/test/testrunner/run_build_test_target.py
@@ -81,7 +81,7 @@ if subprocess.call(clean_command.split()):
 if 'build' in target:
   build_command = target.get('build').format(
       ANDROID_BUILD_TOP = env.ANDROID_BUILD_TOP,
-      MAKE_OPTIONS='DX=  -j{threads}'.format(threads = n_threads))
+      MAKE_OPTIONS='D8= -j{threads}'.format(threads = n_threads))
   sys.stdout.write(str(build_command) + '\n')
   sys.stdout.flush()
   if subprocess.call(build_command.split()):
@@ -90,7 +90,7 @@ if 'build' in target:
 # make runs soong/kati to build the target listed in the entry.
 if 'make' in target:
   build_command = 'build/soong/soong_ui.bash --make-mode'
-  build_command += ' DX='
+  build_command += ' D8='
   build_command += ' -j' + str(n_threads)
   build_command += ' ' + target.get('make')
   if env.DIST_DIR:
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 935ce0ce0b..de0cd626df 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -1241,7 +1241,7 @@ def main():
     if 'jvm' in _user_input_variants['target']:
       build_targets += 'test-art-host-run-test-dependencies '
     build_command = env.ANDROID_BUILD_TOP + '/build/soong/soong_ui.bash --make-mode'
-    build_command += ' DX='
+    build_command += ' D8='
     if dist:
       build_command += ' dist'
     build_command += ' ' + build_targets
diff --git a/tools/veridex/Android.mk b/tools/veridex/Android.mk
index 614952fe37..fbf77e219f 100644
--- a/tools/veridex/Android.mk
+++ b/tools/veridex/Android.mk
@@ -23,14 +23,14 @@ LOCAL_PATH := $(call my-dir)
 
 system_stub_dex := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/core_dex_intermediates/classes.dex
 $(system_stub_dex): PRIVATE_MIN_SDK_VERSION := 1000
-$(system_stub_dex): $(call resolve-prebuilt-sdk-jar-path,system_current) | $(ZIP2ZIP) $(DX)
+$(system_stub_dex): $(call resolve-prebuilt-sdk-jar-path,system_current) | $(ZIP2ZIP) $(D8)
 	$(transform-classes.jar-to-dex)
 
 $(call declare-1p-target,$(system_stub_dex),art)
 
 oahl_stub_dex := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/oahl_dex_intermediates/classes.dex
 $(oahl_stub_dex): PRIVATE_MIN_SDK_VERSION := 1000
-$(oahl_stub_dex): $(call get-prebuilt-sdk-dir,current)/org.apache.http.legacy.jar | $(ZIP2ZIP) $(DX)
+$(oahl_stub_dex): $(call get-prebuilt-sdk-dir,current)/org.apache.http.legacy.jar | $(ZIP2ZIP) $(D8)
 	$(transform-classes.jar-to-dex)
 
 $(call declare-1p-target,$(oahl_stub_dex),art)