commit fc0df95df57441116907ed75c1fad87ef2f51bd8
author Colin Cross <ccross@android.com> Thu Feb 10 11:41:18 2022 -0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Feb 28 21:01:05 2022 +0000
tree f1a0183b5ed8045925c813d37d55e24473364712
parent 1a62a36c8b25101f1f0cfacaf1b6d059b4833e33

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: I39e2cf8ae14edf8510276dab38011afaef85822c
(cherry picked from commit 386ee59a235dfb98560a70f9f7928b7a335cb212)
Merged-In:I39e2cf8ae14edf8510276dab38011afaef85822c

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index fe4c205..22898cd 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1415,7 +1415,7 @@
 		for _, target := range ctx.MultiTargets() {
 			if target.Arch.ArchType.Multilib == "lib64" {
 				addDependenciesForNativeModules(ctx, ApexNativeDependencies{
-					Native_shared_libs: []string{"libclang_rt.hwasan-aarch64-android"},
+					Native_shared_libs: []string{"libclang_rt.hwasan"},
 					Tests:              nil,
 					Jni_libs:           nil,
 					Binaries:           nil,