diff options
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java | 14 |
1 files changed, 6 insertions, 8 deletions
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", |