diff --git a/core/clear_vars.mk b/core/clear_vars.mk index a58ee085a..f7c027ccd 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -194,6 +194,7 @@ LOCAL_DPI_VARIANTS:= LOCAL_DPI_FILE_STEM:= LOCAL_SANITIZE:= LOCAL_SANITIZE_RECOVER:= +LOCAL_NOSANITIZE:= LOCAL_DATA_BINDING:= LOCAL_DBUS_PROXY_PREFIX:= LOCAL_INIT_RC:= diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 3573f0ae1..26dbb7334 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -34,6 +34,11 @@ ifeq ($(LOCAL_SANITIZE),never) my_sanitize := endif +my_nosanitize = $(strip $(LOCAL_NOSANITIZE)) +ifneq ($(my_nosanitize),) + my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize)) +endif + # TSAN is not supported on 32-bit architectures. For non-multilib cases, make # its use an error. For multilib cases, don't use it for the 32-bit case. ifneq ($(filter thread,$(my_sanitize)),)