Make system_server stubs consistent with other stubs

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
Change-Id: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
This commit is contained in:
Anton Hansson
2020-03-19 15:23:38 +00:00
parent bed2ac5dd6
commit bbd78556da
4 changed files with 5 additions and 5 deletions

View File

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