Merge "Stop system server depending on the stubs of itself" into rvc-dev am: 91440b9249

Change-Id: I8159797b0d6fa58017d8c2d27c62edb3fb3c7459
This commit is contained in:
Anton Hansson
2020-04-06 17:44:15 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -48,5 +48,5 @@ java_library {
name: "service-permission-stubs", name: "service-permission-stubs",
srcs: [":service-permission-stubs-srcs"], srcs: [":service-permission-stubs-srcs"],
defaults: ["service-module-stubs-defaults"], defaults: ["service-module-stubs-defaults"],
visibility: ["//visibility:private"] visibility: ["//frameworks/base/services/core"]
} }

View File

@@ -91,7 +91,6 @@ java_library_static {
], ],
libs: [ libs: [
"android_system_server_stubs_current",
"services.net", "services.net",
"android.hardware.light-V2.0-java", "android.hardware.light-V2.0-java",
"android.hardware.power-java", "android.hardware.power-java",
@@ -101,6 +100,7 @@ java_library_static {
"android.net.ipsec.ike.stubs.module_libs_api", "android.net.ipsec.ike.stubs.module_libs_api",
"app-compat-annotations", "app-compat-annotations",
"framework-tethering-stubs-module_libs_api", "framework-tethering-stubs-module_libs_api",
"service-permission-stubs",
], ],
required: [ required: [