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

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

Merge "Add host support to misc legacy AIDL libs" am: f43e3592 am: 88315522 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2105511



Change-Id: Ib13fca701d1369ba75f23c6ad24f008f829e9857
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf2d419b 88315522

libs/binder/Android.bp

+15 −8
Original line number Diff line number Diff line
@@ -60,11 +60,15 @@ cc_library_headers { 
//

// Currently, these are only on system android (not vendor, not host)

// TODO(b/183654927) - move these into separate libraries

libbinder_device_interface_sources = [



filegroup {

    name: "libbinder_device_interface_sources",

    srcs: [

        "IPermissionController.cpp",

        "PermissionCache.cpp",

        "PermissionController.cpp",

]

    ],

}



cc_library {

    name: "libbinder",
@@ -126,19 +130,20 @@ cc_library { 
        "TextOutput.cpp",

        "Utils.cpp",

        ":libbinder_aidl",

        ":libbinder_device_interface_sources",

    ],



    target: {

        android: {

            srcs: libbinder_device_interface_sources,



            // NOT static to keep the wire protocol unfrozen

            static: {

                enabled: false,

            },

        },

        vendor: {

            exclude_srcs: libbinder_device_interface_sources,

            exclude_srcs: [

                ":libbinder_device_interface_sources",

            ],

        },

        darwin: {

            enabled: false,
@@ -370,6 +375,7 @@ filegroup { 


cc_library {

    name: "libbatterystats_aidl",

    host_supported: true,

    srcs: [

        "IBatteryStats.cpp",

    ],
@@ -382,6 +388,7 @@ cc_library { 


cc_library {

    name: "libprocessinfoservice_aidl",

    host_supported: true,

    srcs: [

        "IProcessInfoService.cpp",

        "ProcessInfoService.cpp",

libs/binder/IServiceManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void setDefaultServiceManager(const sp<IServiceManager>& sm) { 
    }

}



#if !defined(__ANDROID_VNDK__) && defined(__ANDROID__)

#if !defined(__ANDROID_VNDK__)

// IPermissionController is not accessible to vendors



bool checkCallingPermission(const String16& permission)