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

Merge "Improve the structure of the link check method" into rvc-dev am: 5e8c81a91d

Browse Source 
Change-Id: I097494045b4ce961b5d0f019e856893e19988e32
This commit is contained in:
Anton Hansson
2020-05-27 11:20:20 +00:00
committed by Automerger Merge Worker
parent f202afab16 5e8c81a91d
commit ec68fb417e
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
java/java.go
View File

@@ -840,41 +840,42 @@ type linkTypeContext interface {
} }
func (m *Module) getLinkType(name string) (ret linkType, stubs bool) { func (m *Module) getLinkType(name string) (ret linkType, stubs bool) {
ver := m.sdkVersion() switch name {
switch { case "core.current.stubs", "core.platform.api.stubs", "stub-annotations",
case name == "core.current.stubs" || name == "core.platform.api.stubs" || "private-stub-annotations-jar", "core-lambda-stubs", "core-generated-annotation-stubs":
name == "stub-annotations" || name == "private-stub-annotations-jar" ||
name == "core-lambda-stubs" || name == "core-generated-annotation-stubs":
return javaCore, true return javaCore, true
case ver.kind == sdkCore: case "android_stubs_current":
return javaCore, false
case name == "android_system_stubs_current":
return javaSystem, true
case ver.kind == sdkSystem:
return javaSystem, false
case name == "android_test_stubs_current":
return javaSystem, true
case ver.kind == sdkTest:
return javaPlatform, false
case name == "android_stubs_current":
return javaSdk, true return javaSdk, true
case ver.kind == sdkPublic: case "android_system_stubs_current":
return javaSdk, false return javaSystem, true
case name == "android_module_lib_stubs_current": case "android_module_lib_stubs_current":
return javaModule, true return javaModule, true
case ver.kind == sdkModule: case "android_system_server_stubs_current":
return javaModule, false
case name == "android_system_server_stubs_current":
return javaSystemServer, true return javaSystemServer, true
case ver.kind == sdkSystemServer: case "android_test_stubs_current":
return javaSystemServer, false return javaSystem, true
case ver.kind == sdkPrivate || ver.kind == sdkNone || ver.kind == sdkCorePlatform:
return javaPlatform, false
case !ver.valid():
panic(fmt.Errorf("sdk_version is invalid. got %q", ver.raw))
default:
return javaSdk, false
} }
ver := m.sdkVersion()
switch ver.kind {
case sdkCore:
return javaCore, false
case sdkSystem:
return javaSystem, false
case sdkPublic:
return javaSdk, false
case sdkModule:
return javaModule, false
case sdkSystemServer:
return javaSystemServer, false
case sdkPrivate, sdkNone, sdkCorePlatform, sdkTest:
return javaPlatform, false
}
if !ver.valid() {
panic(fmt.Errorf("sdk_version is invalid. got %q", ver.raw))
}
return javaSdk, false
} }
func checkLinkType(ctx android.ModuleContext, from *Module, to linkTypeContext, tag dependencyTag) { func checkLinkType(ctx android.ModuleContext, from *Module, to linkTypeContext, tag dependencyTag) {