Merge changes Iaca95efc,I7ccd5581

* changes:
  Add RemoveOptionalPrebuiltPrefix() helper function
  Delegate work of apexInfoMutator to ApexInfoMutator interface
This commit is contained in:
Paul Duffin
2020-12-14 10:54:21 +00:00
committed by Gerrit Code Review
3 changed files with 32 additions and 12 deletions

View File

@@ -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
}