StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up sanitizer configuration."

Browse Source
This commit is contained in:
Dan Albert
2015-04-17 16:47:00 +00:00
committed by Gerrit Code Review
parent 3a5602ebb8 27ccb75af7
commit 2717620873
1 changed files with 25 additions and 8 deletions
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. # Configure SANITIZE_HOST.
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
ifeq ($(SANITIZE_HOST),true) my_sanitize_host := $(strip $(SANITIZE_HOST))
ifneq ($(strip $(LOCAL_CLANG)),false)
ifneq ($(strip $(LOCAL_ADDRESS_SANITIZER)),false)
LOCAL_SANITIZE := address
endif
endif
endif
endif 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 # Keep compatibility for LOCAL_ADDRESS_SANITIZER until all targets have moved to
# `LOCAL_SANITIZE := address`. # `LOCAL_SANITIZE := address`.
@@ -21,8 +25,21 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
my_sanitize += address my_sanitize += address
endif endif
# And `LOCAL_SANITIZE := never`.
ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),false)
my_sanitize := never
endif
# Don't apply sanitizers to NDK code. # Don't apply sanitizers to NDK code.
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_sanitize := never
endif
ifeq ($(my_sanitize),)
my_sanitize := $(my_sanitize_host)
endif
ifeq ($(my_sanitize),never)
my_sanitize := my_sanitize :=
endif endif