From 48d9a5c80b75e87620987cd5648956ab28f121a4 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 27 Apr 2017 18:26:36 -0700 Subject: [PATCH] Build: Disable leak sanitizer for ijar Temporary workaround. Bug: 37756495 Test: ASAN_OPTIONS= SANITIZE_HOST=address mm Change-Id: Idf48f45f0c33fc57af29574c8591a532144d4623 --- core/definitions.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index 293866fc16..8572df0b08 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2393,13 +2393,16 @@ else \ fi endef +# b/37756495 +IJAR_ASAN_OPTIONS := ASAN_OPTIONS=detect_leaks=0 + ## Rule to create a table of contents from a .jar file. ## Must be called with $(eval). # $(1): A .jar file define _transform-jar-to-toc $1.toc: $1 | $(IJAR) @echo Generating TOC: $$@ - $(hide) $(IJAR) $$< $$@.tmp + $(hide) $(IJAR_ASAN_OPTIONS) $(IJAR) $$< $$@.tmp $$(call commit-change-for-toc,$$@) endef