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

Commit 04f9ad0f authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent d8c1e77c

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: [