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

am: da59b50f70 Change-Id: I7efb2dd4ff1bfbc0e9ec16fcb29e4b2e50e9e163
7 years ago · c8e7d35237
parent 3c3e360546 da59b50f70
commit c8e7d35237
2 changed files with 0 additions and 6 deletions
--- a/Android.mk
+++ b/Android.mk
@ -79,7 +79,6 @@ common_static_libraries := \
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libbatteryservice \
 	libavb \

 # TODO: include "cert-err58-cpp" once 36656327 is fixed
--- 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()