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

Commit 7cea50ac authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "charger_props" 

* changes:
  healthd: Convert libhealthd_{draw,charger} to Soong.
  healthd: charger use runtime sysprops instead.
  healthd: remove unused variable.
parents 865f6df8 dbaa477a

healthd/Android.bp

+52 −0
Original line number Diff line number Diff line
@@ -110,3 +110,55 @@ cc_library_static { 
        "libutils",

    ],

}



sysprop_library {

    name: "charger_sysprop",

    srcs: ["charger.sysprop"],

    property_owner: "Platform",

    api_packages: ["android.sysprop"],

}



cc_library_static {

    name: "libhealthd_draw",

    export_include_dirs: ["."],

    static_libs: [

        "libcharger_sysprop",

        "libminui",

    ],

    shared_libs: [

        "libbase",

    ],

    header_libs: ["libbatteryservice_headers"],



    srcs: ["healthd_draw.cpp"],

}



cc_library_static {

    name: "libhealthd_charger",

    local_include_dirs: ["include"],

    export_include_dirs: [".", "include"],



    static_libs: [

        "android.hardware.health@2.0-impl",

        "android.hardware.health@1.0-convert",

        "libcharger_sysprop",

        "libhealthstoragedefault",

        "libhealthd_draw",

        "libminui",

    ],



    shared_libs: [

        "android.hardware.health@2.0",

        "libbase",

        "libcutils",

        "liblog",

        "libpng",

        "libsuspend",

        "libutils",

    ],



    srcs: [

        "healthd_mode_charger.cpp",

        "AnimationParser.cpp",

    ],

}

healthd/Android.mk

+6 −81
Original line number Diff line number Diff line
@@ -2,74 +2,6 @@ 


LOCAL_PATH := $(call my-dir)



### libhealthd_draw ###

include $(CLEAR_VARS)



LOCAL_MODULE := libhealthd_draw



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

LOCAL_STATIC_LIBRARIES := libminui

LOCAL_SHARED_LIBRARIES := libbase

LOCAL_SRC_FILES := healthd_draw.cpp



ifneq ($(TARGET_HEALTHD_DRAW_SPLIT_SCREEN),)

LOCAL_CFLAGS += -DHEALTHD_DRAW_SPLIT_SCREEN=$(TARGET_HEALTHD_DRAW_SPLIT_SCREEN)

else

LOCAL_CFLAGS += -DHEALTHD_DRAW_SPLIT_SCREEN=0

endif



ifneq ($(TARGET_HEALTHD_DRAW_SPLIT_OFFSET),)

LOCAL_CFLAGS += -DHEALTHD_DRAW_SPLIT_OFFSET=$(TARGET_HEALTHD_DRAW_SPLIT_OFFSET)

else

LOCAL_CFLAGS += -DHEALTHD_DRAW_SPLIT_OFFSET=0

endif



LOCAL_HEADER_LIBRARIES := libbatteryservice_headers



include $(BUILD_STATIC_LIBRARY)



### libhealthd_charger ###

include $(CLEAR_VARS)



LOCAL_CFLAGS := -Werror

ifeq ($(strip $(BOARD_CHARGER_DISABLE_INIT_BLANK)),true)

LOCAL_CFLAGS += -DCHARGER_DISABLE_INIT_BLANK

endif

ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)

LOCAL_CFLAGS += -DCHARGER_ENABLE_SUSPEND

endif



LOCAL_SRC_FILES := \

    healthd_mode_charger.cpp \

    AnimationParser.cpp



LOCAL_MODULE := libhealthd_charger

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH) \

    $(LOCAL_PATH)/include



LOCAL_STATIC_LIBRARIES := \

    android.hardware.health@2.0-impl \

    android.hardware.health@1.0-convert \

    libhealthstoragedefault \

    libhealthd_draw \

    libminui \



LOCAL_SHARED_LIBRARIES := \

    android.hardware.health@2.0 \

    libbase \

    libcutils \

    liblog \

    libpng \

    libutils \



ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)

LOCAL_SHARED_LIBRARIES += libsuspend

endif



include $(BUILD_STATIC_LIBRARY)



### charger ###

include $(CLEAR_VARS)

ifeq ($(strip $(BOARD_CHARGER_NO_UI)),true)
@@ -83,18 +15,17 @@ LOCAL_MODULE := charger 
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include



LOCAL_CFLAGS := -Werror

ifeq ($(strip $(LOCAL_CHARGER_NO_UI)),true)

LOCAL_CFLAGS += -DCHARGER_NO_UI

endif



CHARGER_STATIC_LIBRARIES := \

    android.hardware.health@2.0-impl \

    android.hardware.health@1.0-convert \

    libbinderthreadstate \

    libcharger_sysprop \

    libhidltransport \

    libhidlbase \

    libhwbinder_noltopgo \

    libhealthstoragedefault \

    libminui \

    libvndksupport \

    libhealthd_charger \

    libhealthd_charger_nops \
@@ -106,18 +37,12 @@ CHARGER_SHARED_LIBRARIES := \ 
    libbase \

    libcutils \

    libjsoncpp \

    libpng \

    libprocessgroup \

    liblog \

    libutils \



ifneq ($(strip $(LOCAL_CHARGER_NO_UI)),true)

CHARGER_STATIC_LIBRARIES += libminui

CHARGER_SHARED_LIBRARIES += libpng

endif



ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)

CHARGER_SHARED_LIBRARIES += libsuspend

endif



LOCAL_STATIC_LIBRARIES := $(CHARGER_STATIC_LIBRARIES)

LOCAL_SHARED_LIBRARIES := $(CHARGER_SHARED_LIBRARIES)
@@ -141,8 +66,7 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/bin 
LOCAL_MODULE_STEM := charger



LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_CFLAGS := -Wall -Werror

LOCAL_CFLAGS += -DCHARGER_NO_UI

LOCAL_CFLAGS := -Wall -Werror -DCHARGER_FORCE_NO_UI=1



# charger.recovery doesn't link against libhealthd_{charger,draw} or libminui, since it doesn't need

# any UI support.
@@ -150,6 +74,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    android.hardware.health@2.0-impl \

    android.hardware.health@1.0-convert \

    libbinderthreadstate \

    libcharger_sysprop \

    libhidltransport \

    libhidlbase \

    libhwbinder_noltopgo \
@@ -176,7 +101,7 @@ include $(BUILD_EXECUTABLE) 
include $(CLEAR_VARS)

LOCAL_MODULE := charger_test

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_CFLAGS := -Wall -Werror -DCHARGER_NO_UI

LOCAL_CFLAGS := -Wall -Werror

LOCAL_STATIC_LIBRARIES := $(CHARGER_STATIC_LIBRARIES)

LOCAL_SHARED_LIBRARIES := $(CHARGER_SHARED_LIBRARIES)

LOCAL_SRC_FILES := \

healthd/AnimationParser.cpp

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ bool parse_animation_desc(const std::string& content, animation* anim) { 
    static constexpr const char* fail_prefix = "fail: ";

    static constexpr const char* clock_prefix = "clock_display: ";

    static constexpr const char* percent_prefix = "percent_display: ";

    static constexpr const char* frame_prefix = "frame: ";



    std::vector<animation::frame> frames;

healthd/api/current.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
// Signature format: 2.0

healthd/api/removed.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
// Signature format: 2.0