commit fbaaddc588f9d716cff71225a5c510f3b33b90cf
author Evgenii Stepanov <eugenis@google.com> Fri Sep 18 20:41:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 20:41:46 2015 +0000
tree abd5c5eb8cec531b4675b2c4d31f33c2507b316a
parent 963a3e15f6ccea91a5ebffd0babe1a10b8cd65c1
parent 195842474a6722fdf2d967446b81d8accbd4648c

am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."

* commit '195842474a6722fdf2d967446b81d8accbd4648c':
  asan: update condition to work with multiple SANITIZE_TARGET values.

rootdir/Android.mk

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