diff options
| author | 2020-03-19 15:23:38 +0000 | |
|---|---|---|
| committer | 2020-03-25 14:18:02 +0000 | |
| commit | ba6ab2e791f81d1c54f10d2bd986d25a9693f3eb (patch) | |
| tree | d6367a869685a28838afd63d39ea6821f7e88f05 /java/sdk.go | |
| parent | 85f227eed73d98cff60946eb7a450f53e9d362d0 (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
Exempt-From-Owner-Approval: approved internally
Change-Id: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
Merged-In: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
(cherry picked from commit bbd78556daf4a7e015f2e3ddfe9539909e9ebf40)
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sdk.go b/java/sdk.go index ded2a061b..0e132d399 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -406,7 +406,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx)) case sdkSystemServer: // 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: panic(fmt.Errorf("invalid sdk %q", sdkVersion.raw)) } |