Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix memory leak in aapt2"

Browse Source
This commit is contained in:
Ryan Mitchell
2019-09-30 18:10:53 +00:00
committed by Gerrit Code Review
parent 20bdc26698 ac55e41f24
commit 5491eb92fc
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/aapt2/Main.cpp
View File

@@ -169,17 +169,12 @@ int MainImpl(int argc, char** argv) {
aapt::text::Printer printer(&fout); aapt::text::Printer printer(&fout);
aapt::StdErrDiagnostics diagnostics; aapt::StdErrDiagnostics diagnostics;
auto main_command = new aapt::MainCommand(&printer, &diagnostics); aapt::MainCommand main_command(&printer, &diagnostics);
// Add the daemon subcommand here so it cannot be called while executing the daemon // Add the daemon subcommand here so it cannot be called while executing the daemon
main_command->AddOptionalSubcommand( main_command.AddOptionalSubcommand(
aapt::util::make_unique<aapt::DaemonCommand>(&fout, &diagnostics)); aapt::util::make_unique<aapt::DaemonCommand>(&fout, &diagnostics));
return main_command->Execute(args, &std::cerr); return main_command.Execute(args, &std::cerr);
}
// TODO(b/141312058) stop leaks
extern "C" const char *__asan_default_options() {
return "detect_leaks=0";
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {