aboutsummaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-03-19 15:23:38 +0000
committerAnton Hansson <hansson@google.com>2020-03-19 17:42:59 +0000
commitbbd78556daf4a7e015f2e3ddfe9539909e9ebf40 (patch)
treee543a3f2fdc244fea1361402370fd2956e981b91 /java/java.go
parentbed2ac5dd61242cf69d38c099782889a0fd034ef (diff)
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
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index 23dc0b5c5..c73efa4da 100644
--- a/java/java.go
+++ b/java/java.go
@@ -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