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

Commit eb4d9614 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder: split out activitymanager 

(manual cherry-pick from AOSP to fix merge conflict)

libbinder is used in far more contexts than this - minimizing cost to
use libbinder.

Bug: 183654927
Test: boot
Change-Id: I3a7d6888a6b1b5370ff96e137dba2c091c00dabc
parent 875d75d3

libs/binder/Android.bp

+11 −6
Original line number Diff line number Diff line
@@ -60,16 +60,13 @@ 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 = [

    "ActivityManager.cpp",

    "AppOpsManager.cpp",

    "IActivityManager.cpp",

    "IAppOpsCallback.cpp",

    "IAppOpsService.cpp",



    "IPermissionController.cpp",

    "IUidObserver.cpp",

    "PermissionCache.cpp",

    "PermissionController.cpp",

    ":activity_manager_procstate_aidl",

]



cc_library {
@@ -294,13 +291,21 @@ cc_library { 
    ],

}



// TODO(b/183654927): initially empty lib to work around some merge conflicts

cc_library {

    name: "libactivitymanager_aidl",

    srcs: [],

    srcs: [

        "ActivityManager.cpp",

        "IActivityManager.cpp",

        "IUidObserver.cpp",

        ":activity_manager_procstate_aidl",

    ],

    export_include_dirs: ["include_activitymanager"],

    shared_libs: [

        "libbinder",

        "libutils",

        "liblog",

    ],

    aidl: {

        export_aidl_headers: true,

    },

}

libs/binder/include/binder/IActivityManager.h→libs/binder/include_activitymanager/binder/IActivityManager.h

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


#ifndef __ANDROID_VNDK__



#include <binder/IInterface.h>

#include <binder/IUidObserver.h>

#include <binder/IInterface.h>



namespace android {

services/sensorservice/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ cc_library_shared { 
        "libhardware_legacy",

        "libutils",

        "liblog",

        "libactivitymanager_aidl",

        "libbatterystats_aidl",

        "libbinder",

        "libsensor",
@@ -69,8 +70,11 @@ cc_library_shared { 


    generated_headers: ["framework-cppstream-protos"],



    // our public headers depend on libsensor and libsensorprivacy

    export_shared_lib_headers: ["libsensor", "libsensorprivacy"],

    export_shared_lib_headers: [

        "libactivitymanager_aidl",

        "libsensor",

        "libsensorprivacy",

    ],

}



cc_binary {