commit 5930ad519586713a4f8137cbd692f82e4b6b45ee
author Ivan Lozano <ivanlozano@google.com> Mon Aug 14 21:14:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 14 21:14:18 2017 +0000
tree ae85acd6ec2891da68c410732da72da7f005554b
parent d4eb7a322c912c9307561faf59d09a9909d3c7a0
parent 781469ac0a172f0203862e57b217e425d9a6f725

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

Change-Id: I4ce31239411d47b05caee51d051c121786f15083

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ee7ef5e..3630d08 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -240,7 +240,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