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

Commit 24c4140e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main... 

Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main am: 7df02055 am: 062315a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3205752



Change-Id: I096afa6ed6e1868f46b6e627e3e70b6e1e23c36d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f08fdcb 062315a1

services/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ filegroup { 
filegroup {

    name: "services-non-updatable-sources",

    srcs: [

        ":incremental_aidl",

        ":services.core-aidl-sources",

        ":services.core-sources",

        ":services.core-sources-am-wm",

        "core/java/com/android/server/am/package.html",
@@ -377,4 +379,8 @@ non_updatable_exportable_droidstubs { 
        },

    },

    api_surface: "system-server",

    sdk_version: "module_current",

    libs: [

        "framework-annotations-lib",

    ],

}

services/core/Android.bp

+13 −6
Original line number Diff line number Diff line
@@ -30,6 +30,18 @@ filegroup { 
    ],

}



filegroup {

    name: "services.core-aidl-sources",

    srcs: [

        ":dumpstate_aidl",

        ":framework_native_aidl",

        ":gsiservice_aidl",

        ":installd_aidl",

        ":storaged_aidl",

        ":vold_aidl",

    ],

}



java_library_static {

    name: "services-config-update",

    srcs: [
@@ -120,14 +132,9 @@ java_library_static { 
        ":android.hardware.tv.hdmi.earc-V1-java-source",

        ":statslog-art-java-gen",

        ":statslog-contexthub-java-gen",

        ":services.core-aidl-sources",

        ":services.core-sources",

        ":services.core.protologsrc",

        ":dumpstate_aidl",

        ":framework_native_aidl",

        ":gsiservice_aidl",

        ":installd_aidl",

        ":storaged_aidl",

        ":vold_aidl",

        ":platform-compat-config",

        ":platform-compat-overrides",

        ":display-device-config",