Merge "Use single module for clang runtime libraries" into sc-v2-dev-plus-aosp am: 135513ae65

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17036885 Change-Id: I72d5cdd315cad007f6f6a1a1a91f8ca272014f9c
2022-03-01 01:20:47 +00:00
parent d1a81a9ac9 135513ae65
commit 655be5dba9
11 changed files with 32 additions and 119 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1415,7 +1415,7 @@ func (a *apexBundle) AddSanitizerDependencies(ctx android.BottomUpMutatorContext
 		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,