Merge "Don't append _asan to non-asan build flavors."

am: 1782e17ef2

Change-Id: I8f7aaf1152e7e964e7983d91308181077dc7c6f4
This commit is contained in:
Ivan Lozano 2017-08-14 21:10:39 +00:00 committed by android-build-merger
commit 781469ac0a
1 changed files with 1 additions and 1 deletions

View File

@ -230,7 +230,7 @@ VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh
# if it isn't already a part of the flavor (via a dedicated lunch # if it isn't already a part of the flavor (via a dedicated lunch
# config for example). # config for example).
TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
ifdef SANITIZE_TARGET ifneq (, $(filter address, $(SANITIZE_TARGET)))
ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR))) ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR)))
TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan
endif endif