Switch android tools' use of options parser to a more concise form for the single options-base case.

This is to prepare the options parser from making options parser creation exceptions a caught exception. Since all of these classes already have a single options class and used parseAndExitUponError, this allows us to keep behavior consistent between the malformed options-base errors and the incorrect user-input errors.

All the other uses of the options parser in //src/tools already throw sufficiently broad exceptions to not need this.

RELNOTES: None
PiperOrigin-RevId: 165702786

3 files changed, 13 insertions, 16 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
index 4f88bf774e..81fc56cd2e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
@@ -75,6 +75,7 @@ java_binary(
     deps = [
         ":ziputils_lib",
         "//src/main/java/com/google/devtools/common/options",
+        "//third_party:guava",
     ],
 )
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java
index e26db4fe31..931879159a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java
@@ -19,8 +19,8 @@ import com.google.common.base.Predicates;
 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.util.List;
 
 /**
@@ -36,9 +36,9 @@ public class DexMapper {
    * @param args the command line arguments
    */
   public static void main(String[] args) {
-    OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
-    optionsParser.parseAndExitUponError(args);
-    Options options = optionsParser.getOptions(Options.class);
+    DexMapperOptions options =
+        Options.parseAndExitUponError(DexMapperOptions.class, /*allowResidue=*/ true, args)
+            .getOptions();
     List<String> inputs = options.inputJars;
     List<String> outputs = options.outputJars;
     String filterFile = options.mainDexFilter;
@@ -67,10 +67,8 @@ public class DexMapper {
     }
   }
 
-  /**
-   * Commandline options.
-   */
-  public static class Options extends OptionsBase {
+  /** Commandline options. */
+  public static class DexMapperOptions extends OptionsBase {
     @Option(
       name = "input_jar",
       defaultValue = "null",
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java
index 2ba1d9d854..91f1a56eab 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexReducer.java
@@ -27,8 +27,8 @@ import static com.google.devtools.build.android.ziputils.LocalFileHeader.LOCTIM;
 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.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -73,9 +73,9 @@ public class DexReducer implements EntryHandler {
   }
 
   private void parseArguments(String[] args) {
-    OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
-    optionsParser.parseAndExitUponError(args);
-    Options options = optionsParser.getOptions(Options.class);
+    DexReducerOptions options =
+        Options.parseAndExitUponError(DexReducerOptions.class, /*allowResidue=*/ true, args)
+            .getOptions();
     paths = options.inputZips;
     outFile = options.outputZip;
   }
@@ -112,10 +112,8 @@ public class DexReducer implements EntryHandler {
     }
   }
 
-  /**
-   * Commandline options.
-   */
-  public static class Options extends OptionsBase {
+  /** Commandline options. */
+  public static class DexReducerOptions extends OptionsBase {
     @Option(
       name = "input_zip",
       defaultValue = "null",