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

Commit aca40816 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder - split out libbatterystats_aidl" am: 3d5d07b3 am:... 

Merge "libbinder - split out libbatterystats_aidl" am: 3d5d07b3 am: f63578a6 am: cca0c61f am: f2422615

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

Change-Id: Icfc28d9753fa158dd7e80d3bdce5c958596be2a4
parents 7f2f59f2 f2422615

libs/binder/Android.bp

+21 −1
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ cc_library_headers { 
// transport itself and should be moved to AIDL or in domain-specific libs.

//

// 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",

    "IBatteryStats.cpp",

    "IMediaResourceMonitor.cpp",

    "IPermissionController.cpp",

    "IProcessInfoService.cpp",
@@ -263,3 +263,23 @@ aidl_interface { 
        },

    },

}



// libbinder historically contained additional interfaces that provided specific

// functionality in the platform but have nothing to do with binder itself. These

// are moved out of libbinder in order to avoid the overhead of their vtables.

// If you are working on or own one of these interfaces, the responsible things

// to would be:

// - give them a new home

// - convert them to AIDL instead of having manually written parceling code



cc_library {

    name: "libbatterystats_aidl",

    srcs: [

        "IBatteryStats.cpp",

    ],

    export_include_dirs: ["include_batterystats"],

    shared_libs: [

        "libbinder",

        "libutils",

    ],

}

libs/binder/IBatteryStats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <binder/IBatteryStats.h>

#include <batterystats/IBatteryStats.h>



#include <utils/Log.h>

#include <binder/Parcel.h>

services/sensorservice/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ package { 
    default_applicable_licenses: ["frameworks_native_license"],

}



subdirs = [

    "hidl"

]

cc_library_shared {

    name: "libsensorservice",
@@ -52,6 +49,7 @@ cc_library_shared { 
        "libhardware_legacy",

        "libutils",

        "liblog",

        "libbatterystats_aidl",

        "libbinder",

        "libsensor",

        "libsensorprivacy",

services/sensorservice/BatteryService.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <stdint.h>

#include <sys/types.h>



#include <binder/IBatteryStats.h>

#include <batterystats/IBatteryStats.h>

#include <utils/Singleton.h>



namespace android {