commit 3ed9b8b7f95380912a1e8e4c11ad06cf6783ddd9
author Colin Cross <ccross@android.com> Fri Oct 02 01:06:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 02 01:06:10 2020 +0000
tree 14a0c161afae1655271ad87b4a8b5e2587d8dcf3
parent 62ae5b55fec1eb3b7b98466cff076fb29e963f37
parent eb013b236e29fd582f6c768c5373c5b49fef645d

Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b97d98d..586c058 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -281,6 +281,12 @@
     system_manifest.xml \
     system_compatibility_matrix.xml \
 
+# HWASAN runtime for SANITIZE_TARGET=hwaddress builds
+ifneq (,$(filter hwaddress,$(SANITIZE_TARGET)))
+  PRODUCT_PACKAGES += \
+   libclang_rt.hwasan-aarch64-android.bootstrap
+endif
+
 # Host tools to install
 PRODUCT_HOST_PACKAGES += \
     BugReport \