From a49fb99d8cff85326bd9dd13e383c6cb6284dd3b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
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
---
 services/Android.bp      | 3 ++-
 services/core/Android.bp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/Android.bp b/services/Android.bp
index c4be0032ade8e..024155d7dcbed 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 9e19ad2aecf41..723c6b1e8d405 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",