diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-17 18:48:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 18:48:53 +0000 |
| commit | 7a1d29eb4bea37a4f043330cf722f720103129b8 (patch) | |
| tree | 617658ecb4d73ea621fd34980c9bef8efaa88c04 | |
| parent | f1b7c073a4d1b3f47811b6b9e85c6589d293c373 (diff) | |
| parent | 1d8f780c7d15441ad6582fc32447d9409c39f31a (diff) | |
| download | build-7a1d29eb4bea37a4f043330cf722f720103129b8.zip build-7a1d29eb4bea37a4f043330cf722f720103129b8.tar.gz build-7a1d29eb4bea37a4f043330cf722f720103129b8.tar.bz2 | |
am 1d8f780c: Merge "Fix misuse of my_sanitize_host."
* commit '1d8f780c7d15441ad6582fc32447d9409c39f31a':
Fix misuse of my_sanitize_host.
| -rw-r--r-- | core/config_sanitizers.mk | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 99dc55e..b433712 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -2,23 +2,6 @@ ## Perform configuration steps for sanitizers. ############################################## -# Configure SANITIZE_HOST. -ifdef LOCAL_IS_HOST_MODULE - 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 - -# SANITIZE_HOST is only in effect if the module is already using clang (host -# modules that haven't set `LOCAL_CLANG := false` and device modules that have -# set `LOCAL_CLANG := true`. -ifneq ($(my_clang),true) - my_sanitize_host := -endif - my_sanitize := $(strip $(LOCAL_SANITIZE)) # Keep compatibility for LOCAL_ADDRESS_SANITIZER until all targets have moved to @@ -37,8 +20,23 @@ ifdef LOCAL_SDK_VERSION my_sanitize := never endif -ifeq ($(my_sanitize),) - my_sanitize := $(my_sanitize_host) +# Configure SANITIZE_HOST. +ifdef LOCAL_IS_HOST_MODULE + ifeq ($(my_sanitize),) + my_sanitize := $(strip $(SANITIZE_HOST)) + + # SANTIZIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address. + ifeq ($(my_sanitize),true) + my_sanitize := address + endif + + # SANITIZE_HOST is only in effect if the module is already using clang (host + # modules that haven't set `LOCAL_CLANG := false` and device modules that + # have set `LOCAL_CLANG := true`. + ifneq ($(my_clang),true) + my_sanitize := + endif + endif endif ifeq ($(my_sanitize),never) |