Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5bb0d73 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Build: Disable leak sanitizer for aapt 

Temporary workaround.

Bug: 37750224
Test: SANITIZE_HOST=address m
Change-Id: If83e1df25890717d18b841fa65635427ba2ee36a
parent 078aafc5

core/definitions.mk

+5 −2
Original line number Diff line number Diff line
@@ -2000,6 +2000,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 +2017,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)) \
@@ -2590,7 +2593,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)) \