From e98e5625ad5e1004a9bf589518906229371b4eba Mon Sep 17 00:00:00 2001 From: Alexey Polyudov Date: Tue, 27 Mar 2018 15:28:12 -0700 Subject: [PATCH] Do not use UBSAN library on HOST or AUX targets AUX modules are not necessarily using the same toolchain as the TARGET modules. they don't have to depend on this library. Change-Id: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0 Signed-off-by: Alexey Polyudov --- core/config_sanitizers.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 35d077ca6..9ea1ff41e 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -324,8 +324,8 @@ ifneq ($(filter address,$(my_sanitize)),) endif endif -# Use minimal diagnostics when integer overflow is enabled -ifndef LOCAL_IS_HOST_MODULE +# Use minimal diagnostics when integer overflow is enabled; never do it for HOST or AUX modules +ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_IS_AUX_MODULE),) # Pre-emptively add UBSAN minimal runtime incase a static library dependency requires it ifeq ($(filter STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),) ifndef LOCAL_SDK_VERSION