1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
index f074a0cd16..62ad8fe166 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
@@ -27,8 +27,8 @@ import com.google.devtools.build.android.Converters.UnvalidatedAndroidDataConver
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
+import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
-import com.google.devtools.common.options.OptionsParser;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -67,7 +67,7 @@ public class AarGeneratorAction {
   private static final Logger logger = Logger.getLogger(AarGeneratorAction.class.getName());
 
   /** Flag specifications for this action. */
-  public static final class Options extends OptionsBase {
+  public static final class AarGeneratorOptions extends OptionsBase {
     @Option(
       name = "mainData",
       defaultValue = "null",
@@ -137,9 +137,9 @@ public class AarGeneratorAction {
 
   public static void main(String[] args) {
     Stopwatch timer = Stopwatch.createStarted();
-    OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
-    optionsParser.parseAndExitUponError(args);
-    Options options = optionsParser.getOptions(Options.class);
+    AarGeneratorOptions options =
+        Options.parseAndExitUponError(AarGeneratorOptions.class, /*allowResidue=*/ true, args)
+            .getOptions();
 
     checkFlags(options);
 
@@ -181,7 +181,7 @@ public class AarGeneratorAction {
   }
 
   @VisibleForTesting
-  static void checkFlags(Options options) throws IllegalArgumentException {
+  static void checkFlags(AarGeneratorOptions options) {
     List<String> nullFlags = new LinkedList<>();
     if (options.manifest == null) {
       nullFlags.add("manifest");