Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5 am: 2afae90d46

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

Change-Id: I8b4e10e7b973297b2263fa3e41ccdb77b33c6fc4
This commit is contained in:
Colin Cross
2020-10-02 02:27:32 +00:00
committed by Automerger Merge Worker

View File

@@ -281,6 +281,12 @@ PRODUCT_PACKAGES += \
system_manifest.xml \ system_manifest.xml \
system_compatibility_matrix.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 # Host tools to install
PRODUCT_HOST_PACKAGES += \ PRODUCT_HOST_PACKAGES += \
BugReport \ BugReport \