From 7ee2eaaf79cc7fbfa9a4f8218a80719f80c951c3 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 17 Feb 2022 11:29:27 -0800
Subject: [PATCH] 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
Merged-In: Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867
---
 target/product/base_system.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 55047dff6b..694d057ec1 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -295,7 +295,7 @@ PRODUCT_PACKAGES += \
 # 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.