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

Commit c82abe75 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:... 

Merge "Add host support to misc legacy AIDL libs" am: f43e3592 am: 88315522 am: e5f56528 am: 4f89cdc9 am: 39fbb0b5

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



Change-Id: Ifd8c97bf7f4fa82c5cc5229615c62b82543b9058
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd9d761f 39fbb0b5

libs/binder/Android.bp

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

//

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

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

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

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

libbinder_device_interface_sources = [



filegroup {

    name: "libbinder_device_interface_sources",

    srcs: [

        "IPermissionController.cpp",

        "IPermissionController.cpp",

        "PermissionCache.cpp",

        "PermissionCache.cpp",

        "PermissionController.cpp",

        "PermissionController.cpp",

]

    ],

}





cc_library {

cc_library {

    name: "libbinder",

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

        "TextOutput.cpp",

        "Utils.cpp",

        "Utils.cpp",

        ":libbinder_aidl",

        ":libbinder_aidl",

        ":libbinder_device_interface_sources",

    ],

    ],





    target: {

    target: {

        android: {

        android: {

            srcs: libbinder_device_interface_sources,



            // NOT static to keep the wire protocol unfrozen

            // NOT static to keep the wire protocol unfrozen

            static: {

            static: {

                enabled: false,

                enabled: false,

            },

            },

        },

        },

        vendor: {

        vendor: {

            exclude_srcs: libbinder_device_interface_sources,

            exclude_srcs: [

                ":libbinder_device_interface_sources",

            ],

        },

        },

        darwin: {

        darwin: {

            enabled: false,

            enabled: false,
@@ -364,6 +369,7 @@ filegroup { 




cc_library {

cc_library {

    name: "libbatterystats_aidl",

    name: "libbatterystats_aidl",

    host_supported: true,

    srcs: [

    srcs: [

        "IBatteryStats.cpp",

        "IBatteryStats.cpp",

    ],

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




cc_library {

cc_library {

    name: "libprocessinfoservice_aidl",

    name: "libprocessinfoservice_aidl",

    host_supported: true,

    srcs: [

    srcs: [

        "IProcessInfoService.cpp",

        "IProcessInfoService.cpp",

        "ProcessInfoService.cpp",

        "ProcessInfoService.cpp",

libs/binder/IServiceManager.cpp

+1 −1
Original line number Original line 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

// IPermissionController is not accessible to vendors





bool checkCallingPermission(const String16& permission)

bool checkCallingPermission(const String16& permission)