1 files changed, 11 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index bc6d3e2603..8c9887d365 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -493,19 +493,17 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
 
     Artifact jarToDex = proguardOutput.getOutputJar();
     DexingOutput dexingOutput =
-        shouldDexWithJack(ruleContext)
-            ? dexWithJack(ruleContext, androidCommon, proguardSpecs)
-            : dex(
-                ruleContext,
-                androidSemantics,
-                binaryJar,
-                jarToDex,
-                isBinaryJarFiltered,
-                androidCommon,
-                resourceApk.getMainDexProguardConfig(),
-                resourceClasses,
-                derivedJarFunction,
-                proguardOutputMap);
+        dex(
+            ruleContext,
+            androidSemantics,
+            binaryJar,
+            jarToDex,
+            isBinaryJarFiltered,
+            androidCommon,
+            resourceApk.getMainDexProguardConfig(),
+            resourceClasses,
+            derivedJarFunction,
+            proguardOutputMap);
 
     NestedSet<Artifact> nativeLibsZips =
         AndroidCommon.collectTransitiveNativeLibsZips(ruleContext).build();
@@ -1194,23 +1192,6 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     }
   }
 
-  static boolean shouldDexWithJack(RuleContext ruleContext) {
-    return ruleContext
-        .getFragment(AndroidConfiguration.class)
-        .isJackUsedForDexing();
-  }
-
-  static DexingOutput dexWithJack(
-      RuleContext ruleContext, AndroidCommon androidCommon, ImmutableList<Artifact> proguardSpecs) {
-    Artifact classesDexZip =
-        androidCommon.compileDexWithJack(
-            getMultidexMode(ruleContext),
-            Optional.fromNullable(
-                ruleContext.getPrerequisiteArtifact("main_dex_list", Mode.TARGET)),
-            proguardSpecs);
-    return new DexingOutput(classesDexZip, null, ImmutableList.of(classesDexZip));
-  }
-
   /** Creates one or more classes.dex files that correspond to {@code proguardedJar}. */
   private static DexingOutput dex(
       RuleContext ruleContext,