diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 0e84f51647..aa638d41ad 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -446,6 +446,13 @@ endif # If local module needs HWASAN, add compiler flags. ifneq ($(filter hwaddress,$(my_sanitize)),) my_cflags += $(HWADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) + + ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),) + ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) + my_linker := /system/bin/linker_hwasan64 + endif + endif + endif # Use minimal diagnostics when integer overflow is enabled; never do it for HOST modules