diff --git a/core/Makefile b/core/Makefile
index 011291cc7..4972b36a7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -196,7 +196,7 @@ BUILDINFO_SH := build/tools/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