From 2361842291c072b90e16d3fe4667ad61007cbe32 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 2 Nov 2016 15:05:21 -0700 Subject: [PATCH] Export variable for device sanitize arch to Soong Also renames the variable from SANITIZE_ARCH to SANITIZE_TARGET_ARCH, and makes it only apply to the device. Bug: 29498013 Test: No change to build.ninja files with m -j SANITIZE_TARGET=address Change-Id: Ib5f6ab448f5d96d2426c983308136670f9a55b7b --- core/config_sanitizers.mk | 10 ++++++---- core/soong.mk | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 2e14fef5f..3a59ee3f9 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -31,10 +31,12 @@ ifneq ($(SANITIZER.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG),) endif endif -# Add a filter point for 32-bit vs 64-bit sanitization (to lighten the burden). -SANITIZE_ARCH ?= 32 64 -ifeq ($(filter $(SANITIZE_ARCH),$(my_32_64_bit_suffix)),) - my_sanitize := +ifndef LOCAL_IS_HOST_MODULE + # Add a filter point for 32-bit vs 64-bit sanitization (to lighten the burden) + SANITIZE_TARGET_ARCH ?= $(TARGET_ARCH) $(TARGET_2ND_ARCH) + ifeq ($(filter $(SANITIZE_TARGET_ARCH),$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),) + my_sanitize := + endif endif # Add a filter point based on module owner (to lighten the burden). The format is a space- or diff --git a/core/soong.mk b/core/soong.mk index 1d42eb0b6..73622a262 100644 --- a/core/soong.mk +++ b/core/soong.mk @@ -48,6 +48,7 @@ $(SOONG_VARIABLES): FORCE echo ' "Allow_missing_dependencies": $(if $(TARGET_BUILD_APPS)$(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),true,false),'; \ echo ' "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(space),"$(comma)",$(SANITIZE_HOST))")],'; \ echo ' "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET))")],'; \ + echo ' "SanitizeDeviceArch": [$(if $(SANITIZE_TARGET_ARCH),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET_ARCH))")],'; \ echo ' "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \ echo ' "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \ echo ' "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \