From 6aea25d1aada3f92bed09542f2e3682759f0f541 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Thu, 16 May 2019 14:09:35 -0700
Subject: [PATCH] Add "arm64-v8a-hwasan" to the supported ABI list in
 SANITIZE_TARGET=hwaddress builds.

Bug: 132905502
Bug: 133242086
Change-Id: Id4bd6691aa444895878391288d661e5eb43bb4a5
---
 core/board_config.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/board_config.mk b/core/board_config.mk
index d83fa3220d..33cfa62b8a 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -201,6 +201,14 @@ ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT))
   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)