commit a8f254b5a981a8c488076fc0d78159e1e4827f9f
author Søren Gjesse <sgjesse@google.com> Mon Oct 16 12:30:06 2017 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Oct 16 12:30:06 2017 +0200
tree 106897d96e277acdae0775381c9fbde7765a526e
parent 5e8f1baab3a92ef246d214d8db64eb5953538490

Ignore dex files in archives for CompatProguard

Bug: 65865951
Change-Id: I638c44d5e7787f65246512faf776e499c65e5315

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 9a11817..564aa9c 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -43,8 +43,8 @@
       super(CompilationMode.RELEASE);
     }
 
-    protected Builder(boolean forceProguardCompatibility) {
-      super(CompilationMode.RELEASE);
+    protected Builder(boolean ignoreDexInArchive, boolean forceProguardCompatibility) {
+      super(CompilationMode.RELEASE, ignoreDexInArchive);
       this.forceProguardCompatibility = forceProguardCompatibility;
     }
 

src/main/java/com/android/tools/r8/compatproguard/CompatProguardCommandBuilder.java

diff --git a/src/main/java/com/android/tools/r8/compatproguard/CompatProguardCommandBuilder.java b/src/main/java/com/android/tools/r8/compatproguard/CompatProguardCommandBuilder.java
index df2298c..145d0e6 100644
--- a/src/main/java/com/android/tools/r8/compatproguard/CompatProguardCommandBuilder.java
+++ b/src/main/java/com/android/tools/r8/compatproguard/CompatProguardCommandBuilder.java
@@ -8,6 +8,6 @@
 
 public class CompatProguardCommandBuilder extends R8Command.Builder {
   CompatProguardCommandBuilder(boolean forceProguardCompatibility) {
-    super(forceProguardCompatibility);
+    super(true, forceProguardCompatibility);
   }
 }