commit 0b8c15b249a710116f7b969993becc53fed5bba3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 08 03:01:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 08 03:01:39 2019 +0000
tree ae54223b92c0e2882aff3d8125ecb9c178421238
parent 0c55b6d2cb756124a069967cb3d849fd5b01726f
parent 6aea25d1aada3f92bed09542f2e3682759f0f541

Merge "Add "arm64-v8a-hwasan" to the supported ABI list in SANITIZE_TARGET=hwaddress builds."

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 4045c71..db60cee 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -206,6 +206,14 @@
   endif
 endif
 
+# "arm64-v8a-hwasan", the ABI for libraries compiled with HWASAN, is supported
+# in all builds with SANITIZE_TARGET=hwaddress.
+ifneq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+  ifneq ($(filter arm64-v8a,$(TARGET_CPU_ABI_LIST_64_BIT)),)
+    TARGET_CPU_ABI_LIST_64_BIT := arm64-v8a-hwasan $(TARGET_CPU_ABI_LIST_64_BIT)
+  endif
+endif
+
 ifeq (,$(TARGET_CPU_ABI_LIST_32_BIT))
   ifneq (true,$(TARGET_IS_64_BIT))
     TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)