commit d23c726b3655187f0016968811335c72e04239cb
author Paul Duffin <paulduffin@google.com> Fri Dec 11 18:13:08 2020 +0000
committer Paul Duffin <paulduffin@google.com> Fri Dec 11 18:13:08 2020 +0000
tree 22779f395c756c8acdcde02a53bb73f9335954ea
parent a7d6a897747f9c41153962567c89da7ceb69be44

Add RemoveOptionalPrebuiltPrefix() helper function

Test: m nothing
Bug: 171061220
Change-Id: Iaca95efcaf3f02e066751c6e988d609ac40e048a

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 9383e39..d1f5c47 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2749,7 +2749,7 @@
 func baseLibName(depName string) string {
 	libName := strings.TrimSuffix(depName, llndkLibrarySuffix)
 	libName = strings.TrimSuffix(libName, vendorPublicLibrarySuffix)
-	libName = strings.TrimPrefix(libName, "prebuilt_")
+	libName = android.RemoveOptionalPrebuiltPrefix(libName)
 	return libName
 }