commit 63ddfc468d5b8a5c5f4ead28997dd4412fbfbb76
author Googler <sgjesse@google.com> Thu Sep 01 04:24:09 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 01 04:26:28 2022 -0700
tree d020d4ea57cac9da7ac19829df751bab7ac1b453
parent e846207dc2495e39fd178218b29bab3b4a8cd1d1

Remove unsupported option --minimal-main-dex

RELNOTES: None
PiperOrigin-RevId: 471494986
Change-Id: I69641789cfe32111b4ee0afea59f1e309a614677

src/tools/android/java/com/google/devtools/build/android/r8/CompatDx.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/r8/CompatDx.java b/src/tools/android/java/com/google/devtools/build/android/r8/CompatDx.java
index cc694e1..ac0eec1 100644
--- a/src/tools/android/java/com/google/devtools/build/android/r8/CompatDx.java
+++ b/src/tools/android/java/com/google/devtools/build/android/r8/CompatDx.java
@@ -293,15 +293,6 @@
     public int maxIndexNumber;
 
     @Option(
-        name = "minimal-main-dex",
-        defaultValue = "false",
-        documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-        effectTags = {OptionEffectTag.UNKNOWN},
-        allowMultiple = false,
-        help = "Produce smallest possible main dex.")
-    public boolean minimalMainDex;
-
-    @Option(
         name = "main-dex-list",
         defaultValue = "null",
         documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
@@ -379,7 +370,6 @@
     public final boolean noWarning;
     public final boolean multiDex;
     public final String mainDexList;
-    public final boolean minimalMainDex;
     public final int minApiLevel;
     public final String inputList;
     public final List<String> inputs;
@@ -452,7 +442,6 @@
       noWarning = options.noWarning;
       multiDex = options.multiDex;
       mainDexList = options.mainDexList;
-      minimalMainDex = options.minimalMainDex;
       minApiLevel = options.minApiLevel;
       inputList = options.inputList;
       inputs = remaining;
@@ -587,16 +576,6 @@
       }
     }
 
-    if (dexArgs.minimalMainDex && dexArgs.verbose) {
-      if (dexArgs.debug) {
-        System.out.println(
-            "Info: minimal main-dex generation is always done for D8 debug builds."
-                + " Please remove option --minimal-main-dex");
-      } else {
-        throw new DxUsageMessage("Error: minimal main-dex is not supported for D8 release builds");
-      }
-    }
-
     if (dexArgs.maxIndexNumber != 0 && dexArgs.verbose) {
       System.out.println("Warning: internal maximum-index setting is not supported");
     }