commit 7b0ac6d37e5fc272cf6aad2266b1b7d1cb069a2e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 28 18:14:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 18:14:42 2017 +0000
tree ef4e1117dd5654393d092efe347da484f7234be5
parent 9588da7095940e82a7495ef4aaf9ff875a03a260
parent 57838d665f647273eca9b4d2d2cf996c27e76628

Merge "vold: remove unnecessary dependency on libbatteryservice."

Android.mk

diff --git a/Android.mk b/Android.mk
index 45b3f62..936374f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,7 +67,6 @@
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libbatteryservice \
 	libavb \
 
 vold_conlyflags := -std=c11

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