aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Gjesse <sgjesse@google.com>2017-10-24 07:20:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-24 07:20:04 +0000
commit19964a052b6ba6cec56d6aaa4bd50a712d8c76aa (patch)
tree294a3915050fa8c5a54d66eb6187893f0914049c
parent8f26fa92bfd374ea034b6e995c4c2c49401ebb93 (diff)
parent9a1e1c5d21c78b198dae909e8dac7d10d1a37a57 (diff)
downloadr8-19964a052b6ba6cec56d6aaa4bd50a712d8c76aa.tar.gz
Merge "Compat proguard ignores dx option --core-library"
-rw-r--r--src/main/java/com/android/tools/r8/compatproguard/CompatProguard.java4
1 files changed, 4 insertions, 0 deletions
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 d2fd60cc3..4c49a6a1b 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 @@ public class CompatProguard {
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 @@ public class CompatProguard {
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");