Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
am: 2313818c46
Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
diff --git a/Android.mk b/Android.mk
index e92955f..770f0b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,7 +71,6 @@
libfec_rs \
libsquashfs_utils \
libscrypt_static \
- libbatteryservice \
libavb \
# TODO: include "cert-err34-c" once we move to Binder
diff --git a/CheckBattery.cpp b/CheckBattery.cpp
index 6390d02..27b3b0b 100644
--- a/CheckBattery.cpp
+++ b/CheckBattery.cpp
@@ -17,11 +17,6 @@
#define LOG_TAG "VoldCheckBattery"
#include <cutils/log.h>
-#include <binder/IServiceManager.h>
-#include <batteryservice/IBatteryPropertiesRegistrar.h>
-
-using namespace android;
-
extern "C"
{
int is_battery_ok_to_start()