commit 13bbb49c870bba7f1372c69cd72a8ad8f806f8e4
author Colin Cross <ccross@android.com> Thu Feb 17 11:29:27 2022 -0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Feb 28 21:01:02 2022 +0000
tree d37262b23025a22cbade278fb1fa9ed6b6d055fa
parent c0d5ef77ff0e8bc3bfa114348010d1b9228f3989

Use single module for clang runtime libraries

The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.

Bug: 220019988
Test: m checkbuild
Change-Id: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
(cherry picked from commit 7475d557e4ef3961fc5b02f51933b59b64353b38)
Merged-In:Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 55047df..694d057 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -295,7 +295,7 @@
 # HWASAN runtime for SANITIZE_TARGET=hwaddress builds
 ifneq (,$(filter hwaddress,$(SANITIZE_TARGET)))
   PRODUCT_PACKAGES += \
-   libclang_rt.hwasan-aarch64-android.bootstrap
+   libclang_rt.hwasan.bootstrap
 endif
 
 # Jacoco agent JARS to be built and installed, if any.