commit fb882ae717d46db2b8d3685bd74c4beb6df39801
author Søren Gjesse <sgjesse@google.com> Mon May 29 09:17:46 2017 +0200
committer Søren Gjesse <sgjesse@google.com> Mon May 29 09:17:46 2017 +0200
tree 3f7277cac09feac05fe67f13fa8a97615b6618cf
parent f56f7396763633e52f536aa136b6901cc80782a1

Add some asserts to R8Command building

R=zerny@google.com

Change-Id: I1c194be48473fe73fb6f20165bb073be57c63bf7

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

diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index 5b12cf1..877f01d 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -131,6 +131,7 @@
   @Override
   InternalOptions getInternalOptions() {
     InternalOptions internal = new InternalOptions(new DexItemFactory());
+    assert !internal.debug;
     internal.debug = getMode() == CompilationMode.DEBUG;
     internal.minApiLevel = getMinApiLevel();
     internal.fillDexFiles = true;

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 7343fba..424954a 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -277,14 +277,20 @@
 
   InternalOptions getInternalOptions() {
     InternalOptions internal = new InternalOptions(proguardConfiguration.getDexItemFactory());
+    assert !internal.debug;
     internal.debug = getMode() == CompilationMode.DEBUG;
     internal.minApiLevel = getMinApiLevel();
+    assert !internal.skipMinification;
     internal.skipMinification = !useMinification();
+    assert internal.useTreeShaking;
     internal.useTreeShaking = useTreeShaking();
+    assert !internal.ignoreMissingClasses;
     internal.ignoreMissingClasses = ignoreMissingClasses;
 
     // TODO(zerny): Consider which other proguard options should be given flags.
+    assert internal.packagePrefix.length() == 0;
     internal.packagePrefix = proguardConfiguration.getPackagePrefix();
+    assert internal.allowAccessModification;
     internal.allowAccessModification = proguardConfiguration.getAllowAccessModification();
     for (String pattern : proguardConfiguration.getAttributesRemovalPatterns()) {
       internal.attributeRemoval.applyPattern(pattern);
@@ -292,9 +298,11 @@
     if (proguardConfiguration.isIgnoreWarnings()) {
       internal.ignoreMissingClasses = true;
     }
+    assert internal.seedsFile == null;
     if (proguardConfiguration.getSeedFile() != null) {
       internal.seedsFile = proguardConfiguration.getSeedFile();
     }
+    assert !internal.verbose;
     if (proguardConfiguration.isVerbose()) {
       internal.verbose = true;
     }