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

Commit 0e5361be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libbatterymonitor: vendor_available"

parents 8289098f ffff9aae

healthd/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -5,3 +5,16 @@ cc_library_headers { 
    header_libs: ["libbatteryservice_headers"],

    export_header_lib_headers: ["libbatteryservice_headers"],

}



cc_library_static {

    name: "libbatterymonitor",

    srcs: ["BatteryMonitor.cpp"],

    vendor_available: true,

    export_include_dirs: ["include"],

    shared_libs: [

        "libutils",

        "libbase",

    ],

    header_libs: ["libhealthd_headers"],

    export_header_lib_headers: ["libhealthd_headers"],

}

healthd/Android.mk

+0 −8
Original line number Diff line number Diff line
@@ -2,14 +2,6 @@ 


LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := BatteryMonitor.cpp

LOCAL_MODULE := libbatterymonitor

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_STATIC_LIBRARIES := libutils libbase libbinder

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

    healthd_mode_android.cpp \

healthd/include/healthd/BatteryMonitor.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define HEALTHD_BATTERYMONITOR_H



#include <batteryservice/BatteryService.h>

#include <binder/IInterface.h>

#include <utils/String8.h>

#include <utils/Vector.h>