From fa3317bf8edec940eae67e385d302d7bf5735310 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Tue, 14 Dec 2021 14:52:35 -0800 Subject: [PATCH] Avoid leaking Aapt2ResourcePackagingAction args between requests --- .../build/android/Aapt2ResourcePackagingAction.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 083ac5722b89dc..ab30e4e010b7c4 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 @@ -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( @@ -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),