From c6a3ddf8342d0a940c8f4ffd9ea82b4e32df7491 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 26 Jun 2018 14:17:55 -0700 Subject: [PATCH] Do not enable sanitizers on Windows Bug: http://b/69933068 Test: m native-host-cross SANITIZE_HOST=address Change-Id: I0b99797d218dc34d302906d704d991e59698c351 --- core/config_sanitizers.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index aeead0637..e2ac03cd3 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -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))