commit 97222e192a5fab3030e9255b32b612ce8954aebc
author Florian Mayer <fmayer@google.com> Thu Jun 01 14:16:28 2023 -0700
committer Florian Mayer <fmayer@google.com> Thu Jun 01 14:21:54 2023 -0700
tree f6ef62ff4348018c94fb923fac8995c38bef1042
parent 05e0a133aac67bc79f761f679e1473b3c0aa9b71

Use linker_hwasan64 for make built HWASan executables

Test: build chre on oriole_hwasan
      verify linker with `file`
Bug: 276930343
Change-Id: I92e07b38f9198fc72f4aa3418420cc155085b324

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 0e84f516..aa638d4 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -446,6 +446,13 @@
 # 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