diff options
| author | Anton Hansson <hansson@google.com> | 2020-03-19 15:23:32 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-03-19 17:56:49 +0000 |
| commit | a49fb99d8cff85326bd9dd13e383c6cb6284dd3b (patch) | |
| tree | aa8fbf820d514a8f0aca0024640c56b355253581 | |
| parent | 0511558771ed85dabc471d9e1247a6c1594b8dfe (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: I2a9318c8ae036edafac086687601fa73d9bf4678
| -rw-r--r-- | services/Android.bp | 3 | ||||
| -rw-r--r-- | services/core/Android.bp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/Android.bp b/services/Android.bp index c4be0032ade8..024155d7dcbe 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -144,7 +144,8 @@ droidstubs { } java_library { - name: "services-stubs", + name: "android_system_server_stubs_current", srcs: [":services-stubs.sources"], installable: false, + static_libs: ["android_module_lib_stubs_current"], } diff --git a/services/core/Android.bp b/services/core/Android.bp index 9e19ad2aecf4..723c6b1e8d40 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -91,7 +91,7 @@ java_library_static { ], libs: [ - "services-stubs", + "android_system_server_stubs_current", "services.net", "android.hardware.light-V2.0-java", "android.hardware.power-java", |