summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-09-20 03:32:34 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-20 03:32:34 -0700
commit9d01aa8b65453375ea438cefa7cfb2ea4d4baeb7 (patch)
tree2b56d0393e7f6364b4d644ab994daa3bbc861304
parent1a8cd03fbcd83d90240fe9b2f670268b55b27438 (diff)
parent940fec9ef3ac91434560fbe08511028b6e8964b7 (diff)
Merge "aapt2: disable leak detection" am: ff044e701f am: f9479e67d8
am: 940fec9ef3 Change-Id: I704063d1d41f5c1f961ae42c6346e70ee4e24863
-rw-r--r--tools/aapt2/Main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp
index 213bdd2372ec..7966ba27ebd8 100644
--- a/tools/aapt2/Main.cpp
+++ b/tools/aapt2/Main.cpp
@@ -177,6 +177,11 @@ int MainImpl(int argc, char** argv) {
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) {
#ifdef _WIN32
LPWSTR* wide_argv = CommandLineToArgvW(GetCommandLineW(), &argc);