commit 9a1e1c5d21c78b198dae909e8dac7d10d1a37a57
author Søren Gjesse <sgjesse@google.com> Tue Oct 24 08:57:32 2017 +0200
committer Søren Gjesse <sgjesse@google.com> Tue Oct 24 08:57:32 2017 +0200
tree 53ecbf4f4c2f0938053282cef46a3440701ae1b0
parent 02f4ca141444294e91ed58eeae1252dc076938d5

Compat proguard ignores dx option --core-library

We pass all dx options to compat proguard in the Android platform build
and some builds pass --core-library. This option is also ignored by compat dx.

Change-Id: I294988c658a60f6aca46b60b16f0f741a0124668

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

diff --git a/src/main/java/com/android/tools/r8/compatproguard/CompatProguard.java b/src/main/java/com/android/tools/r8/compatproguard/CompatProguard.java
index d2fd60c..4c49a6a 100644
--- a/src/main/java/com/android/tools/r8/compatproguard/CompatProguard.java
+++ b/src/main/java/com/android/tools/r8/compatproguard/CompatProguard.java
@@ -50,6 +50,8 @@
       int minApi = 1;
       boolean forceProguardCompatibility = false;
       boolean multiDex = false;
+      boolean coreLibrary = false;
+
       ImmutableList.Builder<String> builder = ImmutableList.builder();
       if (args.length > 0) {
         StringBuilder currentLine = new StringBuilder(args[0]);
@@ -64,6 +66,8 @@
               output = args[++i];
             } else if (arg.equals("--multi-dex")) {
               multiDex = true;
+            } else if (arg.equals("--core-library")) {
+              coreLibrary = true;
             } else if (arg.equals("-outjars")) {
               throw new CompilationException(
                   "Proguard argument -outjar is not supported. Use R8 compatible --output flag");