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

Merge "Do not enable sanitizers on Windows" am: 0d53f4b12b

Browse Source 
am: a743e206ef

Change-Id: Ife8a84916ce8289981bbabde8c0e48f597d07eba
This commit is contained in:
Pirama Arumuga Nainar
2018-06-26 17:08:38 -07:00
committed by android-build-merger
parent 02d53cd7c0 a743e206ef
commit 5a5588a999
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/config_sanitizers.mk
View File

@@ -12,10 +12,12 @@ my_global_sanitize :=
my_global_sanitize_diag := my_global_sanitize_diag :=
ifeq ($(my_clang),true) ifeq ($(my_clang),true)
ifdef LOCAL_IS_HOST_MODULE 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. # SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
my_global_sanitize := $(subst true,address,$(my_global_sanitize)) my_global_sanitize := $(subst true,address,$(my_global_sanitize))
endif
else else
my_global_sanitize := $(strip $(SANITIZE_TARGET)) my_global_sanitize := $(strip $(SANITIZE_TARGET))
my_global_sanitize_diag := $(strip $(SANITIZE_TARGET_DIAG)) my_global_sanitize_diag := $(strip $(SANITIZE_TARGET_DIAG))