Merge "Use linker_hwasan64 for make built HWASan executables" am: 5e2c1bec02

Original change: https://android-review.googlesource.com/c/platform/build/+/2612134

Change-Id: I09412a2be8e44277757889f1fc99a5866c6294af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer
2023-06-02 05:10:28 +00:00
committed by Automerger Merge Worker

View File

@@ -446,6 +446,13 @@ endif
# If local module needs HWASAN, add compiler flags. # If local module needs HWASAN, add compiler flags.
ifneq ($(filter hwaddress,$(my_sanitize)),) ifneq ($(filter hwaddress,$(my_sanitize)),)
my_cflags += $(HWADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) 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 endif
# Use minimal diagnostics when integer overflow is enabled; never do it for HOST modules # Use minimal diagnostics when integer overflow is enabled; never do it for HOST modules