Merge "Make system_server stubs consistent with other stubs" into rvc-dev am: 10af06b52f am: 0d24f06335 am: 9bc483f20a

Change-Id: Ic778e05ae5e446bcc72e91c24efc9aa6e4550832
2020-03-20 12:46:51 +00:00
parent 7915d37aeb 9bc483f20a
commit 901041ddb6
2 changed files with 3 additions and 2 deletions
--- 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"],
 }
--- 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",