commit 1782e17ef298e7577bd7c9234082cfbae53709a8
author Ivan Lozano <ivanlozano@google.com> Mon Aug 14 18:47:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 14 18:47:43 2017 +0000
tree e583b4d41590b0cd786d985d5ad02c4625699079
parent b145b041275032d604b56da84ae909c58e04105b
parent 0f71db3248afde733e561dc000b09719f33a9ee7

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 011291c..4972b36 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -196,7 +196,7 @@
 # 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