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

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

Browse source 
am: 219806bc7a

* commit '219806bc7a2b07de4655b3421149f32e2f729e01':
  healthd: separate libbatterymonitor for use in recovery.
This commit is contained in:
Yabin Cui 2016-02-19 17:38:26 +00:00 • committed by android-build-merger
commit a90f7761bf
9 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
healthd/Android.mk
View file

@ -6,6 +6,16 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := healthd_board_default.cpp LOCAL_SRC_FILES := healthd_board_default.cpp
LOCAL_MODULE := libhealthd.default LOCAL_MODULE := libhealthd.default
LOCAL_CFLAGS := -Werror 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 $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -20,7 +30,6 @@ endif
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
healthd.cpp \ healthd.cpp \
healthd_mode_android.cpp \ healthd_mode_android.cpp \
BatteryMonitor.cpp \
BatteryPropertiesRegistrar.cpp BatteryPropertiesRegistrar.cpp
ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true) ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)
@ -47,9 +56,9 @@ ifeq ($(strip $(LOCAL_CHARGER_NO_UI)),true)
LOCAL_CFLAGS += -DCHARGER_NO_UI LOCAL_CFLAGS += -DCHARGER_NO_UI
endif 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) ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)
LOCAL_STATIC_LIBRARIES += libminui libpng libz LOCAL_STATIC_LIBRARIES += libminui libpng libz

4
healthd/BatteryMonitor.cpp
View file

@ -16,8 +16,8 @@
#define LOG_TAG "healthd" #define LOG_TAG "healthd"
#include "healthd.h" #include <healthd/healthd.h>
#include "BatteryMonitor.h" #include <healthd/BatteryMonitor.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>

2
healthd/BatteryPropertiesRegistrar.cpp
View file

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

4
healthd/healthd.cpp
View file

@ -17,8 +17,8 @@
#define LOG_TAG "healthd" #define LOG_TAG "healthd"
#define KLOG_LEVEL 6 #define KLOG_LEVEL 6
#include "healthd.h" #include <healthd/healthd.h>
#include "BatteryMonitor.h" #include <healthd/BatteryMonitor.h>
#include <errno.h> #include <errno.h>
#include <libgen.h> #include <libgen.h>

2
healthd/healthd_board_default.cpp
View file

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

2
healthd/healthd_mode_android.cpp
View file

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

2
healthd/healthd_mode_charger.cpp
View file

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

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

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

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