diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-17 17:32:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 17:32:23 +0000 |
| commit | f52cf64f6c1b983d1e79b004779dfa8d810ab304 (patch) | |
| tree | a195b0e7102f250490e29b9c9ab75236ab6283d8 | |
| parent | 3456d3bbf756c59c7c76a551d7afda4cbc9eb903 (diff) | |
| parent | fad709772e766ce83b4667e89a25a7f0d90ca5f8 (diff) | |
| download | build-f52cf64f6c1b983d1e79b004779dfa8d810ab304.zip build-f52cf64f6c1b983d1e79b004779dfa8d810ab304.tar.gz build-f52cf64f6c1b983d1e79b004779dfa8d810ab304.tar.bz2 | |
am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."
* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
Clean up sanitizer configuration.
| -rw-r--r-- | core/config_sanitizers.mk | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 3c07f69..e7a516e 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -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 + my_sanitize_host := $(strip $(SANITIZE_HOST)) endif + +# 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 := $(LOCAL_SANITIZE) +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 |