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

Commit c20272d7 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Selectively add _asan flavor suffix." am: e5143608 am: faea53a8 

am: 8b4eaf55

Change-Id: I9cf0694a66452109a56c693747e9e864af93b594
parents 1d4ee778 8b4eaf55

core/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -225,11 +225,16 @@ endef 
BUILDINFO_SH := build/tools/buildinfo.sh

VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh



# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test harness to distinguish builds.

# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test

# harness to distinguish builds. Only add _asan for a sanitized build

# if it isn't already a part of the flavor (via a dedicated lunch

# config for example).

TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)

ifdef SANITIZE_TARGET

ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR)))

TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan

endif

endif



ifdef TARGET_SYSTEM_PROP

system_prop_file := $(TARGET_SYSTEM_PROP)