Merge changes Iaca95efc,I7ccd5581
* changes: Add RemoveOptionalPrebuiltPrefix() helper function Delegate work of apexInfoMutator to ApexInfoMutator interface
This commit is contained in:
2
cc/cc.go
2
cc/cc.go
@@ -2749,7 +2749,7 @@ func orderStaticModuleDeps(staticDeps []StaticLibraryInfo, sharedDeps []SharedLi
|
||||
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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user