Merge "Do not enable sanitizers on Windows"

am: 0d53f4b12b

Change-Id: I96fde141a4d27c231947f65f3917da30a311b420
This commit is contained in:
Pirama Arumuga Nainar 2018-06-26 17:05:24 -07:00 committed by android-build-merger
commit a743e206ef
1 changed files with 5 additions and 3 deletions

View File

@ -12,10 +12,12 @@ my_global_sanitize :=
my_global_sanitize_diag :=
ifeq ($(my_clang),true)
ifdef LOCAL_IS_HOST_MODULE
my_global_sanitize := $(strip $(SANITIZE_HOST))
ifneq ($(HOST_CROSS_OS),windows)
my_global_sanitize := $(strip $(SANITIZE_HOST))
# SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
my_global_sanitize := $(subst true,address,$(my_global_sanitize))
# SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
my_global_sanitize := $(subst true,address,$(my_global_sanitize))
endif
else
my_global_sanitize := $(strip $(SANITIZE_TARGET))
my_global_sanitize_diag := $(strip $(SANITIZE_TARGET_DIAG))