From 04f9ad0f29b09777fae8256ca418aa35231891a9 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 6 Apr 2020 10:15:10 +0100
Subject: [PATCH] Stop system server depending on the stubs of itself

It should have the stubs of the modules it depends on in its
classpath instead, so link against service-permission-stubs
which is the only module it currently depends on.

Bug: 152864915
Test: m
Change-Id: I4ca19b9ed0db5b9bd61d67e37f5de2e61253bc95
---
 apex/permission/service/Android.bp | 2 +-
 services/core/Android.bp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 5cdcdd335a121..2eb7e99a9dab2 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -48,5 +48,5 @@ java_library {
     name: "service-permission-stubs",
     srcs: [":service-permission-stubs-srcs"],
     defaults: ["service-module-stubs-defaults"],
-    visibility: ["//visibility:private"]
+    visibility: ["//frameworks/base/services/core"]
 }
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 5faed43dd6e61..a8bc2b4bc6ce1 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -91,7 +91,6 @@ java_library_static {
     ],
 
     libs: [
-        "android_system_server_stubs_current",
         "services.net",
         "android.hardware.light-V2.0-java",
         "android.hardware.power-java",
@@ -101,6 +100,7 @@ java_library_static {
         "android.net.ipsec.ike.stubs.module_libs_api",
         "app-compat-annotations",
         "framework-tethering-stubs-module_libs_api",
+        "service-permission-stubs",
     ],
 
     required: [