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

4
java/sdk_test.go
View File

@@ -222,9 +222,9 @@ func TestClasspath(t *testing.T) {
{
name: "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",
java9classpath: []string{"android_module_lib_stubs_current", "services-stubs"},
java9classpath: []string{"android_system_server_stubs_current"},
aidl: "-p" + buildDir + "/framework.aidl",
},
}