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

Commit 126f4d65 authored by Yabin Cui's avatar Yabin Cui Committed by Android (Google) Code Review
Browse files

Merge "healthd: separate libbatterymonitor for use in recovery." into nyc-dev

parents 85def183 f6dbc6d4

healthd/Android.mk

+11 −2
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := healthd_board_default.cpp

LOCAL_MODULE := libhealthd.default

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

include $(BUILD_STATIC_LIBRARY)



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

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)
@@ -14,7 +24,6 @@ LOCAL_SRC_FILES := \ 
	healthd.cpp \

	healthd_mode_android.cpp \

	healthd_mode_charger.cpp \

	BatteryMonitor.cpp \

	BatteryPropertiesRegistrar.cpp



LOCAL_MODULE := healthd
@@ -35,7 +44,7 @@ endif 


LOCAL_C_INCLUDES := bootable/recovery



LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder libminui libpng libz libutils libcutils liblog libm libc

LOCAL_STATIC_LIBRARIES := libbatterymonitor libbatteryservice libbinder libminui libpng libz libutils libcutils liblog libm libc



ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)

LOCAL_STATIC_LIBRARIES += libsuspend

healthd/BatteryMonitor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#define LOG_TAG "healthd"



#include "healthd.h"

#include "BatteryMonitor.h"

#include <healthd/healthd.h>

#include <healthd/BatteryMonitor.h>



#include <dirent.h>

#include <errno.h>

healthd/BatteryPropertiesRegistrar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <utils/Mutex.h>

#include <utils/String16.h>



#include "healthd.h"

#include <healthd/healthd.h>



namespace android {

healthd/healthd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#define LOG_TAG "healthd"

#define KLOG_LEVEL 6



#include "healthd.h"

#include "BatteryMonitor.h"

#include <healthd/healthd.h>

#include <healthd/BatteryMonitor.h>



#include <errno.h>

#include <libgen.h>

healthd/healthd_board_default.cpp

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

 */



#include <healthd.h>

#include <healthd/healthd.h>



void healthd_board_init(struct healthd_config*)

{