ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

healthd: separate libbatterymonitor for use in recovery.

Browse source 
Bug: 26879394

Change-Id: I97b5b4994c42988ce43f5085b8b4b25e9e80c9fa
(cherry picked from commit e98e177a34)
This commit is contained in:
Yabin Cui 2016-02-17 12:21:34 -08:00
parent ac3387b71b
commit f6dbc6d4b8
9 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
healthd/Android.mk
View file

@ -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

4
healthd/BatteryMonitor.cpp
View file

@ -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>

2
healthd/BatteryPropertiesRegistrar.cpp
View file

@ -26,7 +26,7 @@
#include <utils/Mutex.h>
#include <utils/String16.h>
#include "healthd.h"
#include <healthd/healthd.h>
namespace android {

4
healthd/healthd.cpp
View file

@ -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>

2
healthd/healthd_board_default.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <healthd.h>
#include <healthd/healthd.h>
void healthd_board_init(struct healthd_config*)
{

2
healthd/healthd_mode_android.cpp
View file

@ -16,7 +16,7 @@
#define LOG_TAG "healthd-android"
#include "healthd.h"
#include <healthd/healthd.h>
#include "BatteryPropertiesRegistrar.h"
#include <binder/IPCThreadState.h>

2
healthd/healthd_mode_charger.cpp
View file

@ -46,7 +46,7 @@
#include "minui/minui.h"
#include "healthd.h"
#include <healthd/healthd.h>
char *locale;

2
healthd/BatteryMonitor.h → healthd/include/healthd/BatteryMonitor.h
View file

@ -22,7 +22,7 @@
#include <utils/String8.h>
#include <utils/Vector.h>
#include "healthd.h"
#include <healthd/healthd.h>
namespace android {

0
healthd/healthd.h → healthd/include/healthd/healthd.h
View file