Merge "asan: update condition to work with multiple SANITIZE_TARGET values." (ee08fb53) · Commits · e / os / android_system_core

rootdir/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ include $(BUILD_PREBUILT)

	#######################################		#######################################
	# asan.options		# asan.options
	ifeq (address,$(strip $(SANITIZE_TARGET)))		ifneq ($(filter address,$(SANITIZE_TARGET)),)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)

	LOCAL_MODULE := asan.options		LOCAL_MODULE := asan.options
	@@ -33,7 +33,7 @@ LOCAL_MODULE := init.environ.rc
	LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)		LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

	EXPORT_GLOBAL_ASAN_OPTIONS :=		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		EXPORT_GLOBAL_ASAN_OPTIONS := export ASAN_OPTIONS include=/system/asan.options
	LOCAL_REQUIRED_MODULES := asan.options		LOCAL_REQUIRED_MODULES := asan.options
	endif		endif