commit 0a3c83bbc9b9b023f3a7a5a5dd4ba9aa2454b283
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Nov 02 15:45:30 2018 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Nov 02 15:45:30 2018 +0100
tree 6aea615da24e7a156c954ea7d6e6313c7bab9126
parent 8143fa8eb508f5b723cc66049b3678c947f02181

Version 1.3.32

Merge: Proguard -dontobfuscate should only disable minification
CL: https://r8-review.googlesource.com/c/r8/+/29900

Merge: Update ForceProguardCompatibilityTest
CL: https://r8-review.googlesource.com/c/r8/+/29901

Bug: 118658593
Change-Id: I8d447e7f7d76132f5f72c35e6795de602b382597

src/main/java/com/android/tools/r8/R8Command.java

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 5bc4705..ff38d1b 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -619,8 +619,7 @@
   InternalOptions getInternalOptions() {
     InternalOptions internal = new InternalOptions(proguardConfiguration, getReporter());
     assert !internal.debug;
-    internal.debug = getMode() == CompilationMode.DEBUG
-        || (forceProguardCompatibility && !proguardConfiguration.isObfuscating());
+    internal.debug = getMode() == CompilationMode.DEBUG;
     internal.programConsumer = getProgramConsumer();
     internal.minApiLevel = getMinApiLevel();
     internal.enableDesugaring = getEnableDesugaring();

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 12e9b4a..beac96d 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.31";
+  public static final String LABEL = "1.3.32";
 
   private Version() {
   }

src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
index 7e4c4ef..efe2ea0 100644
--- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
@@ -653,7 +653,16 @@
     }
     Path proguardCompatibilityRules = temp.newFile().toPath();
     builder.setProguardCompatibilityRulesOutput(proguardCompatibilityRules);
-    AndroidApp app = ToolHelper.runR8(builder.build(), o -> o.enableClassInlining = false);
+    AndroidApp app =
+        ToolHelper.runR8(
+            builder.build(),
+            o -> {
+              o.enableClassInlining = false;
+
+              // Prevent InterfaceWithDefaultMethods from being merged into
+              // ClassImplementingInterface.
+              o.enableVerticalClassMerging = false;
+            });
     inspection.accept(new CodeInspector(app));
     // Check the Proguard compatibility configuration generated.
     ProguardConfigurationParser parser =