Merge "Fix memory leak in aapt2" am: 5491eb92fc

am: f26f7a206f

Change-Id: I658bb39d0252e503677ffbb0db3d298716f33a64

1 files changed, 3 insertions, 8 deletions

diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp
index 7966ba27ebd8..8a43bb4ede35 100644
--- a/tools/aapt2/Main.cpp
+++ b/tools/aapt2/Main.cpp
@@ -169,17 +169,12 @@ int MainImpl(int argc, char** argv) {
   aapt::text::Printer printer(&fout);
 
   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
-  main_command->AddOptionalSubcommand(
+  main_command.AddOptionalSubcommand(
       aapt::util::make_unique<aapt::DaemonCommand>(&fout, &diagnostics));
-  return main_command->Execute(args, &std::cerr);
-}
-
-// TODO(b/141312058) stop leaks
-extern "C" const char *__asan_default_options() {
-    return "detect_leaks=0";
+  return main_command.Execute(args, &std::cerr);
 }
 
 int main(int argc, char** argv) {