Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev

* changes:
  Build: Add option to restrict sanitization by owner
  Build: Add option to restrict sanitization by architecture
This commit is contained in:
TreeHugger Robot
2016-06-23 02:30:21 +00:00
committed by Android (Google) Code Review

View File

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