diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-04 04:47:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-04 04:47:04 +0000 |
| commit | 2be7eb9161c6dceb23c5881b8e7bc4884d598f02 (patch) | |
| tree | 275f4dab49f8e476f47a56234ea8703af82e283e | |
| parent | 4a3dc1458f554d24f8e0c46b939643b9ebae13e8 (diff) | |
| parent | 48d9a5c80b75e87620987cd5648956ab28f121a4 (diff) | |
| download | build_make-android-o-preview-2.tar.gz build_make-android-o-preview-2.tar.bz2 build_make-android-o-preview-2.zip | |
Merge changes Idf48f45f,Id2a72fe7,If83e1df2android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2
* changes:
Build: Disable leak sanitizer for ijar
Build: Disable leak sanitizer for llvm-rs-cc
Build: Disable leak sanitizer for aapt
| -rw-r--r-- | core/definitions.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 3e99606c61..10d26c45c7 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1017,12 +1017,15 @@ $(foreach d,$1, \ $(hide) echo >> $2 endef +# b/37755219 +RS_CC_ASAN_OPTIONS := ASAN_OPTIONS=detect_leaks=0:detect_container_overflow=0 + define transform-renderscripts-to-java-and-bc @echo "RenderScript: $(PRIVATE_MODULE) <= $(PRIVATE_RS_SOURCE_FILES)" $(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR) $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/res/raw $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/src -$(hide) $(PRIVATE_RS_CC) \ +$(hide) $(RS_CC_ASAN_OPTIONS) $(PRIVATE_RS_CC) \ -o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \ -p $(PRIVATE_RS_OUTPUT_DIR)/src \ -d $(PRIVATE_RS_OUTPUT_DIR) \ @@ -1058,7 +1061,7 @@ define transform-renderscripts-to-cpp-and-bc @echo "RenderScript: $(PRIVATE_MODULE) <= $(PRIVATE_RS_SOURCE_FILES)" $(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR) $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/ -$(hide) $(PRIVATE_RS_CC) \ +$(hide) $(RS_CC_ASAN_OPTIONS) $(PRIVATE_RS_CC) \ -o $(PRIVATE_RS_OUTPUT_DIR)/ \ -d $(PRIVATE_RS_OUTPUT_DIR) \ -a $@ -MD \ @@ -2000,6 +2003,9 @@ else APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION) endif +# b/37750224 +AAPT_ASAN_OPTIONS := ASAN_OPTIONS=detect_leaks=0 + # TODO: Right now we generate the asset resources twice, first as part # of generating the Java classes, then at the end when packaging the final # assets. This should be changed to do one of two things: (1) Don't generate @@ -2014,7 +2020,7 @@ endif define create-resource-java-files @mkdir -p $(PRIVATE_SOURCE_INTERMEDIATES_DIR) @mkdir -p $(dir $(PRIVATE_RESOURCE_PUBLICS_OUTPUT)) -$(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ +$(hide) $(AAPT_ASAN_OPTIONS) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ $(eval # PRIVATE_PRODUCT_AAPT_CONFIG is intentionally missing-- see comment.) \ $(addprefix -J , $(PRIVATE_SOURCE_INTERMEDIATES_DIR)) \ $(addprefix -M , $(PRIVATE_ANDROID_MANIFEST)) \ @@ -2394,13 +2400,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 @@ -2597,7 +2606,7 @@ endef #values; applications can override these by explicitly stating #them in their manifest. define add-assets-to-package -$(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ +$(hide) $(AAPT_ASAN_OPTIONS) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ $(addprefix -c , $(PRIVATE_PRODUCT_AAPT_CONFIG)) \ $(addprefix --preferred-density , $(PRIVATE_PRODUCT_AAPT_PREF_CONFIG)) \ $(addprefix -M , $(PRIVATE_ANDROID_MANIFEST)) \ |