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

Commit 80dcae37 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Replace filegroup with aidl_library module type" am: 3c0960d6... 

Merge "Merge "Replace filegroup with aidl_library module type" am: 3c0960d6 am: a9779031 am: 3775ab66" into udc-dev-plus-aosp am: 06679f55 am: 42908180

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



Change-Id: I2b690bae384395c85881841768a62c2fc9953b47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e94f7b2 42908180

core/java/Android.bp

+9 −4
Original line number Diff line number Diff line
@@ -23,9 +23,14 @@ filegroup { 
    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],

}



filegroup {

    name: "IDropBoxManagerService.aidl",

    srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],

aidl_library {

    name: "IDropBoxManagerService_aidl",

    srcs: [

        "com/android/internal/os/IDropBoxManagerService.aidl",

    ],

    hdrs: [

        "android/os/DropBoxManager.aidl",

    ],

}



filegroup {
@@ -138,7 +143,7 @@ filegroup { 
    ],

}



filegroup {

aidl_library {

    name: "ILogcatManagerService_aidl",

    srcs: ["android/os/logcat/ILogcatManagerService.aidl"],

}

libs/services/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ package { 
cc_library_shared {

    name: "libservices",

    srcs: [

        ":IDropBoxManagerService.aidl",

        ":ILogcatManagerService_aidl",

        "src/content/ComponentName.cpp",

        "src/os/DropBoxManager.cpp",

    ],
@@ -42,7 +40,10 @@ cc_library_shared { 
        "libbase_headers",

    ],

    aidl: {

        include_dirs: ["frameworks/base/core/java/"],

        libs: [

            "ILogcatManagerService_aidl",

            "IDropBoxManagerService_aidl",

        ],

    },



    export_include_dirs: ["include"],