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

Commit 219806bc authored by Yabin Cui's avatar Yabin Cui Committed by Gerrit Code Review
Browse files

Merge "healthd: separate libbatterymonitor for use in recovery."

parents 6288b28f e98e177a

healthd/Android.mk

+12 −3
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)
@@ -20,7 +30,6 @@ endif 
LOCAL_SRC_FILES := \

	healthd.cpp \

	healthd_mode_android.cpp \

	BatteryMonitor.cpp \

	BatteryPropertiesRegistrar.cpp



ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)
@@ -47,9 +56,9 @@ ifeq ($(strip $(LOCAL_CHARGER_NO_UI)),true) 
LOCAL_CFLAGS += -DCHARGER_NO_UI

endif



LOCAL_C_INCLUDES := bootable/recovery

LOCAL_C_INCLUDES := bootable/recovery $(LOCAL_PATH)/include



LOCAL_STATIC_LIBRARIES := libbatteryservice libbinder

LOCAL_STATIC_LIBRARIES := libbatterymonitor libbatteryservice libbinder



ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)

LOCAL_STATIC_LIBRARIES += libminui libpng libz

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*)

{