From 5039d8cd2180e3ba3c8f320a616a1b84f499e0cf Mon Sep 17 00:00:00 2001 From: Ivan Krasin Date: Fri, 18 Sep 2015 11:59:46 -0700 Subject: [PATCH] asan: update condition to work with multiple SANITIZE_TARGET values. The goal is to enable SANITIZE_TARGET='address coverage', which will be used by LLVMFuzzer. Bug: 22850550 Change-Id: Iea756eaaedaa56aee4daf714510269efe3aaa553 --- rootdir/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f853fac9d..8b1699634 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -13,7 +13,7 @@ include $(BUILD_PREBUILT) ####################################### # 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 := init.environ.rc 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