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

am: 781469ac0a

Change-Id: I4ce31239411d47b05caee51d051c121786f15083
This commit is contained in:
Ivan Lozano 2017-08-14 21:14:18 +00:00 committed by android-build-merger
commit 5930ad5195

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