Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dd6f6b4 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ibe63c54169069955473d5174381976c158705dba
parents 8793892b 91440b92

apex/permission/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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"]

}

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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: [