commit da59b50f70a64aead47ffb5ba7a29b2e570d2bc3
author Yifan Hong <elsk@google.com> Thu Sep 28 18:32:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 28 18:32:23 2017 +0000
tree 70f5a082396ac8637751d368c09328fab6a88bbe
parent 958c216d870d72303255720f3307c997041e0901
parent a6f34f6e7849a4dadca184da253fb0b48bb792fa

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

Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af

Android.mk

diff --git a/Android.mk b/Android.mk
index d0b199d..1d46166 100644
--- a/Android.mk
+++ b/Android.mk
@@ -72,7 +72,6 @@
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libbatteryservice \
 	libavb \
 
 # TODO: include "cert-err34-c" once we move to Binder

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