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

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

Merge "Refactor for moved batterystats AIDL." am: ed53c412 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1660623

Change-Id: I3a684754d9a6076d857c2d9ad546f0091b96d40a
parents 91464953 ed53c412

media/utils/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ cc_library { 
    ],

    static_libs: [

        "libc_malloc_debug_backtrace",

        "libbatterystats_aidl",

    ],

    shared_libs: [

        "libaudioutils", // for clock.h
@@ -48,6 +49,9 @@ cc_library { 
        "android.hardware.graphics.bufferqueue@1.0",

        "android.hidl.token@1.0-utils",

    ],

    export_static_lib_headers: [

        "libbatterystats_aidl",

    ],



    logtags: ["EventLogTags.logtags"],

media/utils/fuzzers/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package { 
cc_defaults {

    name: "libmediautils_fuzzer_defaults",

    shared_libs: [

        "libbatterystats_aidl",

        "libbinder",

        "libcutils",

        "liblog",

media/utils/fuzzers/SchedulingPolicyServiceFuzz.cpp

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

 */

#define LOG_TAG "BatteryNotifierFuzzer"

#include <binder/IBatteryStats.h>

#include <batterystats/IBatteryStats.h>

#include <binder/IServiceManager.h>

#include <utils/String16.h>

#include <android/log.h>

media/utils/include/mediautils/BatteryNotifier.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef MEDIA_BATTERY_NOTIFIER_H

#define MEDIA_BATTERY_NOTIFIER_H



#include <binder/IBatteryStats.h>

#include <batterystats/IBatteryStats.h>

#include <utils/Singleton.h>

#include <utils/String8.h>