commit c8e7d35237fad35f739e0917c48264db696c077a
author Yifan Hong <elsk@google.com> Thu Sep 28 18:34:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 28 18:34:53 2017 +0000
tree 0cabd542465db81a580fc0db2ef9f724ba14ded3
parent 3c3e3605460c54b7dd5733f60bb210d9c9858cad
parent da59b50f70a64aead47ffb5ba7a29b2e570d2bc3

Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e am: 2313818c46 am: a6f34f6e78
am: da59b50f70

Change-Id: I7efb2dd4ff1bfbc0e9ec16fcb29e4b2e50e9e163

Android.mk

diff --git a/Android.mk b/Android.mk
index dae747e..f59ac76 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,7 +79,6 @@
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libbatteryservice \
 	libavb \
 
 # TODO: include "cert-err58-cpp" once 36656327 is fixed

CheckBattery.cpp

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