From bde7d4f2e4c568476d555b8a6a665db221012c9a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 19 Mar 2020 15:23:32 +0000 Subject: [PATCH] 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 Merged-In: I2a9318c8ae036edafac086687601fa73d9bf4678 (cherry picked from commit a49fb99d8cff85326bd9dd13e383c6cb6284dd3b) --- services/Android.bp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/Android.bp b/services/Android.bp index 8ebad4efc1b5f..30dbbd411a79e 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -138,7 +138,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"], }