tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix misuse of my_sanitize_host."

Browse source
This commit is contained in:
Dan Albert 2015-04-17 18:33:40 +00:00 committed by Gerrit Code Review
commit 1d8f780c7d
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/config_sanitizers.mk
View file

@ -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)