StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in sdk_library string matching" am: f247ff73ae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665886

Change-Id: Ia06beabd8b9cfca9a6c2f7735d79086f39ecf1a5
This commit is contained in:
Anton Hansson
2021-04-08 09:46:59 +00:00
committed by Automerger Merge Worker
parent 48e488b71f f247ff73ae
commit abde6d24d4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/sdk_library.go
View File

@@ -201,8 +201,12 @@ func initApiScope(scope *apiScope) *apiScope {
return scope return scope
} }
func (scope *apiScope) stubsLibraryModuleNameSuffix() string {
return ".stubs" + scope.moduleSuffix
}
func (scope *apiScope) stubsLibraryModuleName(baseName string) string { func (scope *apiScope) stubsLibraryModuleName(baseName string) string {
return baseName + ".stubs" + scope.moduleSuffix return baseName + scope.stubsLibraryModuleNameSuffix()
} }
func (scope *apiScope) stubsSourceModuleName(baseName string) string { func (scope *apiScope) stubsSourceModuleName(baseName string) string {
@@ -1684,16 +1688,20 @@ var _ sdkLibraryComponentNamingScheme = (*defaultNamingScheme)(nil)
func moduleStubLinkType(name string) (stub bool, ret sdkLinkType) { func moduleStubLinkType(name string) (stub bool, ret sdkLinkType) {
// This suffix-based approach is fragile and could potentially mis-trigger. // This suffix-based approach is fragile and could potentially mis-trigger.
// TODO(b/155164730): Clean this up when modules no longer reference sdk_lib stubs directly. // TODO(b/155164730): Clean this up when modules no longer reference sdk_lib stubs directly.
if strings.HasSuffix(name, ".stubs.public") || strings.HasSuffix(name, "-stubs-publicapi") { if strings.HasSuffix(name, apiScopePublic.stubsLibraryModuleNameSuffix()) {
if name == "hwbinder.stubs" || name == "libcore_private.stubs" {
// Due to a previous bug, these modules were not considered stubs, so we retain that.
return false, javaPlatform
}
return true, javaSdk return true, javaSdk
} }
if strings.HasSuffix(name, ".stubs.system") || strings.HasSuffix(name, "-stubs-systemapi") { if strings.HasSuffix(name, apiScopeSystem.stubsLibraryModuleNameSuffix()) {
return true, javaSystem return true, javaSystem
} }
if strings.HasSuffix(name, ".stubs.module_lib") || strings.HasSuffix(name, "-stubs-module_libs_api") { if strings.HasSuffix(name, apiScopeModuleLib.stubsLibraryModuleNameSuffix()) {
return true, javaModule return true, javaModule
} }
if strings.HasSuffix(name, ".stubs.test") { if strings.HasSuffix(name, apiScopeTest.stubsLibraryModuleNameSuffix()) {
return true, javaSystem return true, javaSystem
} }
return false, javaPlatform return false, javaPlatform