openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Evgenii Stepanov 2015-09-18 20:31:52 +00:00 committed by Android Git Automerger
parent 84c5dd0f17 ee08fb53bb
commit 195842474a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootdir/Android.mk
View File

@ -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