Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851f5b22 authored by Yifan Hong's avatar Yifan Hong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "health_cleanup" into stage-aosp-master 

* changes:
  healthd: add missing libbatteryservice_headers dep
  storaged: fix headers.
parents 97c0fd52 9a81d54c

healthd/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ else 
LOCAL_CFLAGS += -DHEALTHD_DRAW_SPLIT_OFFSET=0

endif



LOCAL_HEADER_LIBRARIES := libbatteryservice_headers



include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

storaged/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ cc_library_static { 
    ],



    static_libs: ["libhealthhalutils"],

    header_libs: ["libbatteryservice_headers"],



    logtags: ["EventLogTags.logtags"],

storaged/include/storaged.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <unordered_map>

#include <vector>



#include <batteryservice/IBatteryPropertiesListener.h>

#include <utils/Mutex.h>



#include <android/hardware/health/2.0/IHealth.h>

storaged/include/uid_info.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <string>

#include <unordered_map>



#include <binder/Parcelable.h>



namespace android {

namespace os {

namespace storaged {

storaged/storaged.cpp

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <batteryservice/BatteryServiceConstants.h>

#include <cutils/properties.h>