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

Make system_server stubs consistent with other stubs

Browse Source 
Include the module_api stubs in system_server one instead of
putting both of these jars on the classpath. Also rename it
to be in line with the other stubs.

Bug: 149293194
Test: m
Exempt-From-Owner-Approval: approved internally
Change-Id: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
Merged-In: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
(cherry picked from commit bbd78556da)
This commit is contained in:
Anton Hansson
2020-03-19 15:23:38 +00:00
parent 85f227eed7
commit ba6ab2e791
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -847,7 +847,7 @@ func (m *Module) getLinkType(name string) (ret linkType, stubs bool) {
return javaModule, true return javaModule, true
case ver.kind == sdkModule: case ver.kind == sdkModule:
return javaModule, false return javaModule, false
case name == "services-stubs": case name == "android_system_server_stubs_current":
return javaSystemServer, true return javaSystemServer, true
case ver.kind == sdkSystemServer: case ver.kind == sdkSystemServer:
return javaSystemServer, false return javaSystemServer, false

2
java/sdk.go
View File

@@ -406,7 +406,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx)) return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))
case sdkSystemServer: case sdkSystemServer:
// TODO(146757305): provide .apk and .aidl that have more APIs for modules // TODO(146757305): provide .apk and .aidl that have more APIs for modules
return toModule([]string{"android_module_lib_stubs_current", "services-stubs"}, "framework-res", sdkFrameworkAidlPath(ctx)) return toModule([]string{"android_system_server_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))
default: default:
panic(fmt.Errorf("invalid sdk %q", sdkVersion.raw)) panic(fmt.Errorf("invalid sdk %q", sdkVersion.raw))
} }

4
java/sdk_test.go
View File

@@ -222,9 +222,9 @@ func TestClasspath(t *testing.T) {
{ {
name: "system_server_current", name: "system_server_current",
properties: `sdk_version: "system_server_current",`, properties: `sdk_version: "system_server_current",`,
bootclasspath: []string{"android_module_lib_stubs_current", "services-stubs", "core-lambda-stubs"}, bootclasspath: []string{"android_system_server_stubs_current", "core-lambda-stubs"},
system: "core-current-stubs-system-modules", system: "core-current-stubs-system-modules",
java9classpath: []string{"android_module_lib_stubs_current", "services-stubs"}, java9classpath: []string{"android_system_server_stubs_current"},
aidl: "-p" + buildDir + "/framework.aidl", aidl: "-p" + buildDir + "/framework.aidl",
}, },
} }

2
java/testing.go
View File

@@ -148,7 +148,7 @@ func GatherRequiredDepsForTest() string {
"android_system_stubs_current", "android_system_stubs_current",
"android_test_stubs_current", "android_test_stubs_current",
"android_module_lib_stubs_current", "android_module_lib_stubs_current",
"services-stubs", "android_system_server_stubs_current",
"core.current.stubs", "core.current.stubs",
"core.platform.api.stubs", "core.platform.api.stubs",
"kotlin-stdlib", "kotlin-stdlib",