vogar: drop support for dx

dx is deprecated.

Fix: 145587038
Test: art/tools/run-libcore-tests.sh --mode host
Test: m run-vogar-tests
Change-Id: I2a294f39daf56908bc9f0033f284e06ed2bab4d3

8 files changed, 8 insertions, 32 deletions

diff --git a/Android.mk b/Android.mk
index 4d77bef..6bf77fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,7 +38,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
   vogar-kxml-libcore-20110123
 
 LOCAL_ADDITIONAL_DEPENDENCIES := \
-  $(HOST_OUT_EXECUTABLES)/dx \
   $(HOST_OUT_EXECUTABLES)/d8 \
   $(HOST_OUT_JAVA_LIBRARIES)/desugar.jar
 
diff --git a/src/vogar/Dexer.java b/src/vogar/Dexer.java
index 0e38715..3bf50f0 100644
--- a/src/vogar/Dexer.java
+++ b/src/vogar/Dexer.java
@@ -20,6 +20,5 @@ package vogar;
  * Available tools for generating dex files
  */
 public enum Dexer {
-    DX,
     D8,
 }
diff --git a/src/vogar/Toolchain.java b/src/vogar/Toolchain.java
index b19d2cb..1d8189d 100644
--- a/src/vogar/Toolchain.java
+++ b/src/vogar/Toolchain.java
@@ -19,17 +19,13 @@ package vogar;
 import vogar.Dexer;
 
 public enum Toolchain {
-    // .dex: desugar + javac + dx
-    DX,
     // .dex: desugar + javac + d8
     D8,
     // .class: javac
     JAVAC;
 
     public Dexer getDexer() {
-        if (this == Toolchain.DX) {
-            return Dexer.DX;
-        } else if (this == Toolchain.D8) {
+        if (this == Toolchain.D8) {
             return Dexer.D8;
         }
         throw new IllegalStateException("No dexer for toolchain " + this);
diff --git a/src/vogar/Vogar.java b/src/vogar/Vogar.java
index 2be22e9..7fba4aa 100644
--- a/src/vogar/Vogar.java
+++ b/src/vogar/Vogar.java
@@ -260,7 +260,7 @@ public final class Vogar {
         System.out.println("      DEFAULT: default (or N/A), X32: 32-bit, X64: 64-bit");
         System.out.println("      Default is: " + variant);
         System.out.println();
-        System.out.println("  --toolchain <DX|D8|JAVAC>: Which toolchain to use.");
+        System.out.println("  --toolchain <D8|JAVAC>: Which toolchain to use.");
         System.out.println("      Default depends on --mode value (currently "
                 + modeId.defaultToolchain() + " for --mode=" + modeId + ")");
         System.out.println();
diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index 068508a..8d18264 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -43,12 +43,11 @@ import vogar.util.Strings;
 
 
 /**
- * Android SDK commands such as adb, aapt and dx.
+ * Android SDK commands such as adb, aapt and d8.
  */
 public class AndroidSdk {
 
     private static final String D8_COMMAND_NAME = "d8";
-    private static final String DX_COMMAND_NAME = "dx";
     private static final String ARBITRARY_BUILD_TOOL_NAME = D8_COMMAND_NAME;
 
     private final Log log;
@@ -101,7 +100,7 @@ public class AndroidSdk {
          * Android build tree (target):
          *  ${ANDROID_BUILD_TOP}/out/host/linux-x86/bin/aapt
          *  ${ANDROID_BUILD_TOP}/out/host/linux-x86/bin/adb
-         *  ${ANDROID_BUILD_TOP}/out/host/linux-x86/bin/dx
+         *  ${ANDROID_BUILD_TOP}/out/host/linux-x86/bin/d8
          *  ${ANDROID_BUILD_TOP}/out/host/linux-x86/bin/desugar.jar
          *  ${ANDROID_BUILD_TOP}/out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates
          *      /classes.jar
@@ -379,11 +378,8 @@ public class AndroidSdk {
          * same package they're testing, even when that's a core
          * library package. If you're actually just using this tool to
          * execute arbitrary code, this has the unfortunate
-         * side-effect of preventing "dx" from protecting you from
+         * side-effect of preventing "d8" from protecting you from
          * yourself.
-         *
-         * Memory options pulled from build/core/definitions.mk to
-         * handle large dx input when building dex for APK.
          */
 
         Command.Builder builder = new Command.Builder(log);
@@ -391,20 +387,6 @@ public class AndroidSdk {
             builder.args("/usr/bin/time").args("-v");
         }
         switch (dexer) {
-            case DX:
-                builder.args(DX_COMMAND_NAME);
-                builder.args("-JXms16M").args("-JXmx1536M");
-                builder.args("-JXX:+TieredCompilation").args("-JXX:TieredStopAtLevel=1");
-                builder.args("--min-sdk-version=" + language.getMinApiLevel());
-                if (multidex) {
-                    builder.args("--multi-dex");
-                }
-                builder.args("--dex")
-                    .args("--output=" + output)
-                    .args("--core-library")
-                    .args(filePaths);
-                builder.execute();
-                break;
             case D8:
                 List<String> sanitizedOutputFilePaths;
                 try {
diff --git a/src/vogar/android/DeviceRuntime.java b/src/vogar/android/DeviceRuntime.java
index 5c317ce..2b5f01f 100644
--- a/src/vogar/android/DeviceRuntime.java
+++ b/src/vogar/android/DeviceRuntime.java
@@ -61,7 +61,7 @@ public final class DeviceRuntime implements Mode {
             Task currentDexTask = addCreateDexJarAndPushTasks(result, run.basenameOfJar(classpathElement),
                     classpathElement, null);
             // If {@code serialDexing} is enabled, make each subsequent dex task
-            // depend on previous so any moment of time only one dexer (d8 or dx) instance is run
+            // depend on previous so any moment of time only one dexer (d8) instance is run
             // simultaneously.
             if (lastDexTask != null && run.serialDexing) {
                 currentDexTask.afterSuccess(lastDexTask);
diff --git a/src/vogar/android/InstallApkTask.java b/src/vogar/android/InstallApkTask.java
index a62e85a..7186392 100644
--- a/src/vogar/android/InstallApkTask.java
+++ b/src/vogar/android/InstallApkTask.java
@@ -47,7 +47,7 @@ public final class InstallApkTask extends Task {
         // We can't just give dex multiple jars with conflicting class names
 
         // With that in mind, the APK packaging strategy is as follows:
-        // 1. dx to create a dex
+        // 1. d8 to create a dex
         // 2. aapt the dex to create apk
         // 3. sign the apk
         // 4. install the apk
diff --git a/test/vogar/android/AbstractModeTest.java b/test/vogar/android/AbstractModeTest.java
index 8f60b78..f6f379a 100644
--- a/test/vogar/android/AbstractModeTest.java
+++ b/test/vogar/android/AbstractModeTest.java
@@ -83,7 +83,7 @@ public abstract class AbstractModeTest {
                     + ". Please check stdout.");
         }
 
-        run = new Run(vogar, Toolchain.DX, console, mkdir, androidSdk, new Rm(console), target,
+        run = new Run(vogar, Toolchain.D8, console, mkdir, androidSdk, new Rm(console), target,
                 new File("runner/dir"));
 
         classpath = new Classpath();