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 ResourceShrinkerAction args between requests #14145

Closed
wants to merge 3 commits into from
Closed

Avoid leaking ResourceShrinkerAction args between requests #14145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
958878e
Avoid leaking ResourceShrinkerAction args between requests
Bencodes Oct 20, 2021
c16189a
Merge branch 'bazelbuild:master' into avoid-leaking-resourceshrinkera…
Bencodes Oct 21, 2021
5aa44cd
Merge branch 'bazelbuild:master' into avoid-leaking-resourceshrinkera…
Bencodes Oct 22, 2021
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
7 changes: 2 additions & 5 deletions src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@ public static final class Options extends OptionsBase {
public VariantType packageType;
}

private static AaptConfigOptions aaptConfigOptions;
private static Options options;

private static String getManifestPackage(Path manifest)
throws SAXException, IOException, StreamException, ParserConfigurationException {
ManifestData manifestData = AndroidManifestParser.parse(Files.newInputStream(manifest));
Expand All @@ -246,8 +243,8 @@ public static void main(String[] args) throws Exception {
.argsPreProcessor(new ShellQuotedParamsFilePreProcessor(FileSystems.getDefault()))
.build();
optionsParser.parseAndExitUponError(args);
aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
options = optionsParser.getOptions(Options.class);
AaptConfigOptions aaptConfigOptions = optionsParser.getOptions(AaptConfigOptions.class);
Options options = optionsParser.getOptions(Options.class);

AndroidResourceProcessor resourceProcessor = new AndroidResourceProcessor(stdLogger);
// Setup temporary working directories.
Expand Down