Clean up usages of setAllowResidue and enableParamsFileSupport to pass values into the factory method.
PiperOrigin-RevId: 252870697
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
index 3b98cc8..230a81c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
@@ -62,9 +62,10 @@
public static void main(String[] args) throws Exception {
Profiler profiler = InMemoryProfiler.createAndStart("setup");
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, Aapt2ConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ Aapt2ConfigOptions.class);
optionsParser.parseAndExitUponError(args);
aaptConfigOptions = optionsParser.getOptions(Aapt2ConfigOptions.class);
options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
index ba599c8..ce84d49 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
@@ -47,9 +47,10 @@
final Profiler profiler = LoggingProfiler.createAndStart("shrink").startTask("flags");
// Parse arguments.
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(ImmutableList.of(Options.class, Aapt2ConfigOptions.class));
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ Aapt2ConfigOptions.class);
optionsParser.parseAndExitUponError(args);
Aapt2ConfigOptions aapt2ConfigOptions = optionsParser.getOptions(Aapt2ConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
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 7fbc0f1..7ea8cee 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
@@ -162,9 +162,10 @@
public static void main(String[] args) {
Stopwatch timer = Stopwatch.createStarted();
- OptionsParser optionsParser = OptionsParser.newOptionsParser(AarGeneratorOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser optionsParser =
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ AarGeneratorOptions.class);
optionsParser.parseAndExitUponError(args);
AarGeneratorOptions options = optionsParser.getOptions(AarGeneratorOptions.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AbstractBusyBoxAction.java b/src/tools/android/java/com/google/devtools/build/android/AbstractBusyBoxAction.java
index 66657d4..dc05273 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AbstractBusyBoxAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AbstractBusyBoxAction.java
@@ -18,8 +18,6 @@
import com.google.devtools.common.options.OptionsBase;
import com.google.devtools.common.options.OptionsParser;
import com.google.devtools.common.options.OptionsParsingException;
-import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
-import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -54,8 +52,6 @@
@VisibleForTesting
void invokeWithoutExit(String[] args) throws Exception {
timer.start();
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
optionsParser.parse(args);
try (ScopedTemporaryDirectory scopedTmp = new ScopedTemporaryDirectory(description + "_tmp");
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
index 1a91858..744e952 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java
@@ -24,6 +24,8 @@
import com.google.devtools.common.options.OptionEffectTag;
import com.google.devtools.common.options.OptionsBase;
import com.google.devtools.common.options.OptionsParser;
+import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor;
+import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
@@ -43,7 +45,9 @@
}
private static AndroidAssetMergingAction create() {
- return new AndroidAssetMergingAction(OptionsParser.newOptionsParser(Options.class));
+ return new AndroidAssetMergingAction(
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()), Options.class));
}
private AndroidAssetMergingAction(OptionsParser optionsParser) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
index cd50c9f..97f7082 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
@@ -48,9 +48,10 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataBindingProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataBindingProcessingAction.java
index 50eb067..9b697f9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataBindingProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataBindingProcessingAction.java
@@ -100,9 +100,10 @@
public static void main(String[] args) throws IOException {
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
index 5b31767..8282875 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
@@ -218,9 +218,10 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java
index e2a98e4..475d804 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java
@@ -69,9 +69,9 @@
}
public static void main(String[] args) throws Exception {
- OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser optionsParser =
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()), Options.class);
optionsParser.parseAndExitUponError(args);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 58302ec..37d31ed 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -362,9 +362,10 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
index 2e1fd8e..7948c20 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java
@@ -118,9 +118,10 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java b/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java
index 0a96595..611bdc3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java
@@ -104,9 +104,10 @@
public static void main(String[] args) throws Exception {
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, Aapt2ConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ Aapt2ConfigOptions.class);
optionsParser.parseAndExitUponError(args);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
index 1df76b3..681509d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
@@ -130,9 +130,10 @@
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
index fdacd1f..a62cbb2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/LibraryRClassGeneratorAction.java
@@ -103,9 +103,10 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
index 57cc1fc..eca81e0 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
@@ -185,9 +185,9 @@
}
public static void main(String[] args) throws Exception {
- OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser optionsParser =
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()), Options.class);
optionsParser.parseAndExitUponError(args);
options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
index 72d5916..0428675 100644
--- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
@@ -148,9 +148,9 @@
public static void main(String[] args) throws Exception {
final Stopwatch timer = Stopwatch.createStarted();
- OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser optionsParser =
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()), Options.class);
optionsParser.parseAndExitUponError(args);
Options options = optionsParser.getOptions(Options.class);
Preconditions.checkNotNull(options.classJarOutput);
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
index 297d376..a74d0de 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
@@ -229,10 +229,9 @@
}
private static int processRequest(List<String> args) throws Exception {
- OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
- optionsParser.setAllowResidue(true);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser optionsParser =
+ OptionsParser.newOptionsParser(
+ true, new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()), Options.class);
Options options;
try {
optionsParser.parse(args);
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
index 441e9fe..95fc1e0 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
@@ -232,9 +232,10 @@
final Stopwatch timer = Stopwatch.createStarted();
// Parse arguments.
OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, AaptConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ AaptConfigOptions.class);
optionsParser.parseAndExitUponError(args);
aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
options = optionsParser.getOptions(Options.class);
diff --git a/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java b/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java
index bf0356c..455f845 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java
@@ -153,9 +153,10 @@
public static void main(String[] args) throws Exception {
final OptionsParser optionsParser =
- OptionsParser.newOptionsParser(Options.class, Aapt2ConfigOptions.class);
- optionsParser.enableParamsFileSupport(
- new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()));
+ OptionsParser.newOptionsParser(
+ new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()),
+ Options.class,
+ Aapt2ConfigOptions.class);
optionsParser.parse(args);
Options options = optionsParser.getOptions(Options.class);
