Skip to content

Commit 63ddfc4

Browse files
sgjessecopybara-github
authored andcommitted
Remove unsupported option --minimal-main-dex
RELNOTES: None PiperOrigin-RevId: 471494986 Change-Id: I69641789cfe32111b4ee0afea59f1e309a614677
1 parent e846207 commit 63ddfc4

File tree

1 file changed

+0
-21
lines changed
  • src/tools/android/java/com/google/devtools/build/android/r8

1 file changed

+0
-21
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -292,15 +292,6 @@ public static class Options extends OptionsBase {
292292
help = "Undocumented: Set maximal index number to use in a dex file.")
293293
public int maxIndexNumber;
294294

295-
@Option(
296-
name = "minimal-main-dex",
297-
defaultValue = "false",
298-
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
299-
effectTags = {OptionEffectTag.UNKNOWN},
300-
allowMultiple = false,
301-
help = "Produce smallest possible main dex.")
302-
public boolean minimalMainDex;
303-
304295
@Option(
305296
name = "main-dex-list",
306297
defaultValue = "null",
@@ -379,7 +370,6 @@ public static class DxCompatOptions {
379370
public final boolean noWarning;
380371
public final boolean multiDex;
381372
public final String mainDexList;
382-
public final boolean minimalMainDex;
383373
public final int minApiLevel;
384374
public final String inputList;
385375
public final List<String> inputs;
@@ -452,7 +442,6 @@ private DxCompatOptions(Options options, List<String> remaining) {
452442
noWarning = options.noWarning;
453443
multiDex = options.multiDex;
454444
mainDexList = options.mainDexList;
455-
minimalMainDex = options.minimalMainDex;
456445
minApiLevel = options.minApiLevel;
457446
inputList = options.inputList;
458447
inputs = remaining;
@@ -587,16 +576,6 @@ private static void run(String[] args)
587576
}
588577
}
589578

590-
if (dexArgs.minimalMainDex && dexArgs.verbose) {
591-
if (dexArgs.debug) {
592-
System.out.println(
593-
"Info: minimal main-dex generation is always done for D8 debug builds."
594-
+ " Please remove option --minimal-main-dex");
595-
} else {
596-
throw new DxUsageMessage("Error: minimal main-dex is not supported for D8 release builds");
597-
}
598-
}
599-
600579
if (dexArgs.maxIndexNumber != 0 && dexArgs.verbose) {
601580
System.out.println("Warning: internal maximum-index setting is not supported");
602581
}

0 commit comments

Comments
 (0)