healthd: Convert libhealthd_{draw,charger} to Soong.
Converting charger to Soong, one step at a time.
In the meantime, drop the use of BOARD_*/TARGET_* variables
in Android.mk because runtime sysprops will be used instead.
Libraries / binaries will always link to libminui / libpng /
libsuspend.
charger{.recovery,} can't be converted to Soong yet because
of the use of HAL_STATIC_LIBRARIES (Bug 127677771).
charger_test isn't converted because of the shared list
of CHARGER_{STATIC,SHARED}_LIBRARIES.
Bug: 124118169
Test: run charger on walleye
Change-Id: I355deda14e5b5c9938256ff0b778590ac0191095
This commit is contained in:
Yifan Hong
parent
97eecdc875
commit
dbaa477a70
|
|
@ -117,3 +117,48 @@ sysprop_library {
|
|||
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",
|
||||
],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,75 +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 := libcharger_sysprop 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 \
|
||||
libcharger_sysprop \
|
||||
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)
|
||||
|
|
@ -94,6 +25,7 @@ CHARGER_STATIC_LIBRARIES := \
|
|||
libhidlbase \
|
||||
libhwbinder_noltopgo \
|
||||
libhealthstoragedefault \
|
||||
libminui \
|
||||
libvndksupport \
|
||||
libhealthd_charger \
|
||||
libhealthd_charger_nops \
|
||||
|
|
@ -105,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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue