p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration." 

* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
  Clean up sanitizer configuration.
This commit is contained in:
Dan Albert 2015-04-17 17:32:23 +00:00 committed by Android Git Automerger
parent 3456d3bbf7 fad709772e
commit f52cf64f6c
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/config_sanitizers.mk
View File

@ -4,16 +4,20 @@
# Configure SANITIZE_HOST.
ifdef LOCAL_IS_HOST_MODULE
ifeq ($(SANITIZE_HOST),true)
ifneq ($(strip $(LOCAL_CLANG)),false)
ifneq ($(strip $(LOCAL_ADDRESS_SANITIZER)),false)
LOCAL_SANITIZE := address
endif
endif
endif
my_sanitize_host := $(strip $(SANITIZE_HOST))
endif
my_sanitize := $(LOCAL_SANITIZE)
# SANTIZIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
ifeq ($(my_sanitize_host),true)
my_sanitize_host := address
endif
# `LOCAL_CLANG := false` disables SANITIZE_HOST.
ifeq ($(my_clang),false)
my_sanitize_host :=
endif
my_sanitize := $(strip $(LOCAL_SANITIZE))
# Keep compatibility for LOCAL_ADDRESS_SANITIZER until all targets have moved to
# `LOCAL_SANITIZE := address`.
@ -21,8 +25,21 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
my_sanitize += address
endif
# And `LOCAL_SANITIZE := never`.
ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),false)
my_sanitize := never
endif
# Don't apply sanitizers to NDK code.
ifdef LOCAL_SDK_VERSION
my_sanitize := never
endif
ifeq ($(my_sanitize),)
my_sanitize := $(my_sanitize_host)
endif
ifeq ($(my_sanitize),never)
my_sanitize :=
endif