Merge "Don't append _asan to non-asan build flavors." am: 1782e17ef2 am: 781469ac0a

am: 5930ad5195

Change-Id: I6f73c3f2f74c8613941331d49bdba6717a220c02
This commit is contained in:
Ivan Lozano
2017-08-14 22:41:20 +00:00
committed by android-build-merger

View File

@@ -240,7 +240,7 @@ VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh
# 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
ifneq (, $(filter address, $(SANITIZE_TARGET)))
ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR)))
TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan
endif