Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbaaddc5 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Android Git Automerger
Browse files

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

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

* commit '19584247':
  asan: update condition to work with multiple SANITIZE_TARGET values.
parents 963a3e15 19584247

rootdir/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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