Ensure compile dump classes are standalone

Change-Id: If413e5f3ea081ff234c1d8cb8539efbfaa063975

src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java

diff --git a/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java b/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
index 0db7bc9..86e2e39 100644
--- a/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
+++ b/src/main/java/com/android/tools/r8/utils/CompileDumpCompatR8.java
@@ -3,8 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.utils;
 
-import static com.android.tools.r8.BaseCompilerCommandParser.LIB_FLAG;
-
 import com.android.tools.r8.CompatProguardCommandBuilder;
 import com.android.tools.r8.CompilationFailedException;
 import com.android.tools.r8.CompilationMode;
@@ -59,7 +57,7 @@
   private static final List<String> VALID_OPTIONS_WITH_SINGLE_OPERAND =
       Arrays.asList(
           "--output",
-          LIB_FLAG,
+          "--lib",
           "--classpath",
           "--min-api",
           "--main-dex-rules",
@@ -176,7 +174,7 @@
               outputPath = Paths.get(operand);
               break;
             }
-          case LIB_FLAG:
+          case "--lib":
             {
               library.add(Paths.get(operand));
               break;

src/main/java/com/android/tools/r8/utils/CompileDumpD8.java

diff --git a/src/main/java/com/android/tools/r8/utils/CompileDumpD8.java b/src/main/java/com/android/tools/r8/utils/CompileDumpD8.java
index ba95354..d169b1e 100644
--- a/src/main/java/com/android/tools/r8/utils/CompileDumpD8.java
+++ b/src/main/java/com/android/tools/r8/utils/CompileDumpD8.java
@@ -3,8 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.utils;
 
-import static com.android.tools.r8.BaseCompilerCommandParser.LIB_FLAG;
-
 import com.android.tools.r8.CompilationFailedException;
 import com.android.tools.r8.CompilationMode;
 import com.android.tools.r8.D8;
@@ -45,7 +43,7 @@
   private static final List<String> VALID_OPTIONS_WITH_SINGLE_OPERAND =
       Arrays.asList(
           "--output",
-          LIB_FLAG,
+          "--lib",
           "--classpath",
           "--min-api",
           "--main-dex-rules",
@@ -110,7 +108,7 @@
               outputPath = Paths.get(operand);
               break;
             }
-          case LIB_FLAG:
+          case "--lib":
             {
               library.add(Paths.get(operand));
               break;

src/main/java/com/android/tools/r8/utils/CompileDumpR8Assistant.java

diff --git a/src/main/java/com/android/tools/r8/utils/CompileDumpR8Assistant.java b/src/main/java/com/android/tools/r8/utils/CompileDumpR8Assistant.java
index d78c13a..26e995b 100644
--- a/src/main/java/com/android/tools/r8/utils/CompileDumpR8Assistant.java
+++ b/src/main/java/com/android/tools/r8/utils/CompileDumpR8Assistant.java
@@ -3,9 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8.utils;
 
-import static com.android.tools.r8.BaseCompilerCommandParser.LIB_FLAG;
-import static com.android.tools.r8.BaseCompilerCommandParser.MIN_API_FLAG;
-
 import com.android.tools.r8.CompilationFailedException;
 import com.android.tools.r8.CompilationMode;
 import com.android.tools.r8.OutputMode;
@@ -31,7 +28,7 @@
   private static final List<String> VALID_OPTIONS = Arrays.asList("--reflective-usage-json-output");
 
   private static final List<String> VALID_OPTIONS_WITH_SINGLE_OPERAND =
-      Arrays.asList("--output", LIB_FLAG, "--classpath", MIN_API_FLAG, "--threads");
+      Arrays.asList("--output", "--lib", "--classpath", "--min-api", "--threads");
 
   public static void main(String[] args) throws CompilationFailedException {
     Path outputPath = null;
@@ -61,7 +58,7 @@
               outputPath = Paths.get(operand);
               break;
             }
-          case LIB_FLAG:
+          case "--lib":
             {
               library.add(Paths.get(operand));
               break;
@@ -71,7 +68,7 @@
               classpath.add(Paths.get(operand));
               break;
             }
-          case MIN_API_FLAG:
+          case "--min-api":
             {
               minApi = Integer.parseInt(operand);
               break;