Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid leaking Aapt2ResourcePackagingAction args between requests #14425

Closed
wants to merge 1 commit into from
Closed

Avoid leaking Aapt2ResourcePackagingAction args between requests #14425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ public class Aapt2ResourcePackagingAction {

private static final StdLogger STD_LOGGER = new StdLogger(StdLogger.Level.WARNING);

private static Aapt2ConfigOptions aaptConfigOptions;
private static Options options;

/** Flag specifications for this action. */
public static final class Options extends OptionsBase {
@Option(
Expand Down Expand Up @@ -358,8 +355,9 @@ public static void main(String[] args) throws Exception {
.argsPreProcessor(new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()))
.build();
optionsParser.parseAndExitUponError(args);
aaptConfigOptions = optionsParser.getOptions(Aapt2ConfigOptions.class);
options = optionsParser.getOptions(Options.class);

Aapt2ConfigOptions aaptConfigOptions = optionsParser.getOptions(Aapt2ConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);

Preconditions.checkArgument(
options.packageId == -1 || (options.packageId >= 2 && options.packageId <= 255),
Expand Down