Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
am: fbe2eedb28
Change-Id: I5ba3ae957001974e33d6d6f49d542c05b9c13aba
This commit is contained in:
commit
d35dcb9092
1 changed files with 17 additions and 0 deletions
|
@ -24,6 +24,23 @@ ifneq ($(my_global_sanitize),)
|
|||
my_sanitize := $(my_global_sanitize)
|
||||
endif
|
||||
|
||||
# Add a filter point for 32-bit vs 64-bit sanitization (to lighten the burden).
|
||||
SANITIZE_ARCH ?= 32 64
|
||||
ifeq ($(filter $(SANITIZE_ARCH),$(my_32_64_bit_suffix)),)
|
||||
my_sanitize :=
|
||||
endif
|
||||
|
||||
# Add a filter point based on module owner (to lighten the burden). The format is a space- or
|
||||
# colon-separated list of owner names.
|
||||
ifneq (,$(SANITIZE_NEVER_BY_OWNER))
|
||||
ifneq (,$(LOCAL_MODULE_OWNER))
|
||||
ifneq (,$(filter $(LOCAL_MODULE_OWNER),$(subst :, ,$(SANITIZE_NEVER_BY_OWNER))))
|
||||
$(warning Not sanitizing $(LOCAL_MODULE) based on module owner.)
|
||||
my_sanitize :=
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Don't apply sanitizers to NDK code.
|
||||
ifdef LOCAL_SDK_VERSION
|
||||
my_sanitize :=
|
||||
|
|
Loading…
Reference in a new issue