commit 9804da0544168f878b5adde8bf6e3a2e0b1c8d02
author Paul Duffin <paulduffin@google.com> Tue Oct 26 10:42:42 2021 +0100
committer Paul Duffin <paulduffin@google.com> Tue Oct 26 10:43:23 2021 +0100
tree 4c223210b85aa01c863c3a1811080ec4d08f2a1a
parent cbab07b45f272d8de7df81d13c9f57e637905a8f

Dedup use of "prebuilt_"

Bug: 177893770
Test: m nothing
Change-Id: I664ee4d9c3aafda3de0a3f8985ee23f25db38680

cc/prebuilt.go

diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 62f3938..4a2c451 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -16,7 +16,6 @@
 
 import (
 	"path/filepath"
-	"strings"
 
 	"android/soong/android"
 )
@@ -232,7 +231,7 @@
 
 // Implements versionedInterface
 func (p *prebuiltLibraryLinker) implementationModuleName(name string) string {
-	return strings.TrimPrefix(name, "prebuilt_")
+	return android.RemoveOptionalPrebuiltPrefix(name)
 }
 
 func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {