diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-17 11:04:06 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-04-17 11:32:57 -0700 |
| commit | 4c92a681272519fa17c2b4a8bc807e2e7fe8e974 (patch) | |
| tree | 617658ecb4d73ea621fd34980c9bef8efaa88c04 /core | |
| parent | 94b579166fa9daabf5bfde579b2739a19975e872 (diff) | |
| download | build-4c92a681272519fa17c2b4a8bc807e2e7fe8e974.zip build-4c92a681272519fa17c2b4a8bc807e2e7fe8e974.tar.gz build-4c92a681272519fa17c2b4a8bc807e2e7fe8e974.tar.bz2 | |
Fix misuse of my_sanitize_host.
Ying pointed out in https://android-review.googlesource.com/#/c/147290
that my_sanitize_host would be read as some garbage value for target
builds. Move the configuration later and don't use the local at all.
Change-Id: Id8a095821d000a184e72f950b9481597073a7044
Diffstat (limited to 'core')
| -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) |