am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit 'ee08fb53bb59cb5037755d68de09e6e5bc3f8bc6':
asan: update condition to work with multiple SANITIZE_TARGET values.
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index f853fac..8b16996 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -13,7 +13,7 @@
#######################################
# asan.options
-ifeq (address,$(strip $(SANITIZE_TARGET)))
+ifneq ($(filter address,$(SANITIZE_TARGET)),)
include $(CLEAR_VARS)
LOCAL_MODULE := asan.options
@@ -33,7 +33,7 @@
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
EXPORT_GLOBAL_ASAN_OPTIONS :=
-ifeq (address,$(strip $(SANITIZE_TARGET)))
+ifneq ($(filter address,$(SANITIZE_TARGET)),)
EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS include=/system/asan.options
LOCAL_REQUIRED_MODULES := asan.options
endif