| commit | 8143fa8eb508f5b723cc66049b3678c947f02181 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Nov 01 15:45:07 2018 +0100 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Nov 01 15:45:07 2018 +0100 |
| tree | e6970c6b8cd817d1d2dd20ef867f72e8baec07bd | |
| parent | fa6ed6d32c06d8a272cf596ffe9f8ee88637bcde [diff] |
Version 1.3.31 Merge: Disable minimal main dex for release builds CL: https://r8-review.googlesource.com/c/r8/+/29848 Bug: 118658593 Change-Id: Ibc53fcfa797acd2d1c4458d38512a019ded8002b
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java index 78a9d3f..5bc4705 100644 --- a/src/main/java/com/android/tools/r8/R8Command.java +++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -642,7 +642,7 @@ assert !internal.verbose; internal.mainDexKeepRules = mainDexKeepRules; - internal.minimalMainDex = internal.debug; + internal.minimalMainDex = getMode() == CompilationMode.DEBUG; internal.mainDexListConsumer = mainDexListConsumer; internal.lineNumberOptimization = !internal.debug && (proguardConfiguration.isOptimizing() || internal.enableMinification)
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 752bd26..12e9b4a 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "1.3.30"; + public static final String LABEL = "1.3.31"; private Version() { }