ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BatteryMonitor: fix depending on multiple versions of the same aidl_interface

Browse source 
When health aidl_interface version updraged, some libraries are
depending on V1 and libbatterymonitor or libhealthd_charger_ui at
the same time. It will cause multiple versions depending if
libbatterymonitor or libhealthd_charger_ui are depending on new
version.

Fork libbatterymonitor and libhealthd_charger_ui to generate two
versions, so that other libraries can depend on the same aidl_interface
version, to avoid multiple versions depending.

Bug: 251425963
Test: build
Change-Id: I37ba23169428677550176916e5d0b52c154d7b85
Signed-off-by: Jack Wu <wjack@google.com>
This commit is contained in:
Jack Wu 2023-01-10 14:50:52 +08:00
parent fe9d83251b
commit f83e5a6ebd
1 changed files with 90 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
healthd/Android.bp
View file

@ -2,6 +2,67 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_defaults {
name: "libbatterymonitor_defaults",
srcs: ["BatteryMonitor.cpp"],
cflags: ["-Wall", "-Werror"],
vendor_available: true,
recovery_available: true,
export_include_dirs: ["include"],
shared_libs: [
"libutils",
"libbase",
// Need HealthInfo definition from headers of these shared
// libraries. Clients don't need to link to these.
"android.hardware.health@2.1",
],
header_libs: ["libhealthd_headers"],
export_header_lib_headers: ["libhealthd_headers"],
}
cc_defaults {
name: "libhealthd_charger_ui_defaults",
vendor_available: true,
export_include_dirs: [
"include",
"include_charger",
],
static_libs: [
"libcharger_sysprop",
"libhealthd_draw",
"libhealthloop",
"libminui",
],
shared_libs: [
"libbase",
"libcutils",
"liblog",
"libpng",
"libsuspend",
"libutils",
],
header_libs: [
"libhealthd_headers",
],
srcs: [
"healthd_mode_charger.cpp",
"AnimationParser.cpp",
],
target: {
vendor: {
exclude_static_libs: [
"libcharger_sysprop",
],
},
},
}
cc_library_headers {
name: "libhealthd_headers",
vendor_available: true,
@ -13,18 +74,8 @@ cc_library_headers {
cc_library_static {
name: "libbatterymonitor",
srcs: ["BatteryMonitor.cpp"],
cflags: ["-Wall", "-Werror"],
vendor_available: true,
recovery_available: true,
export_include_dirs: ["include"],
shared_libs: [
"libutils",
"libbase",
// Need HealthInfo definition from headers of these shared
// libraries. Clients don't need to link to these.
"android.hardware.health@2.1",
defaults: ["libbatterymonitor_defaults"],
static_libs: [
"android.hardware.health-V1-ndk",
],
whole_static_libs: [
@ -32,8 +83,20 @@ cc_library_static {
// BatteryMonitor.
"android.hardware.health-translate-ndk",
],
header_libs: ["libhealthd_headers"],
export_header_lib_headers: ["libhealthd_headers"],
}
// TODO(b/251425963): remove when android.hardware.health is upgraded to V2.
cc_library_static {
name: "libbatterymonitor-V1",
defaults: ["libbatterymonitor_defaults"],
static_libs: [
"android.hardware.health-V1-ndk",
],
whole_static_libs: [
// Need to translate HIDL to AIDL to support legacy APIs in
// BatteryMonitor.
"android.hardware.health-translate-V1-ndk",
],
}
cc_defaults {
@ -136,50 +199,31 @@ cc_library_static {
cc_library_static {
name: "libhealthd_charger_ui",
vendor_available: true,
export_include_dirs: [
"include",
"include_charger",
],
defaults: ["libhealthd_charger_ui_defaults"],
static_libs: [
"android.hardware.health-V1-ndk",
"android.hardware.health-translate-ndk",
"libcharger_sysprop",
"libhealthd_draw",
"libhealthloop",
"libminui",
],
shared_libs: [
"libbase",
"libcutils",
"liblog",
"libpng",
"libsuspend",
"libutils",
],
header_libs: [
"libhealthd_headers",
],
export_static_lib_headers: [
"android.hardware.health-V1-ndk",
],
}
srcs: [
"healthd_mode_charger.cpp",
"AnimationParser.cpp",
// TODO(b/251425963): remove when android.hardware.health is upgraded to V2.
cc_library_static {
name: "libhealthd_charger_ui-V1",
defaults: ["libhealthd_charger_ui_defaults"],
static_libs: [
"android.hardware.health-V1-ndk",
"android.hardware.health-translate-V1-ndk",
],
target: {
vendor: {
exclude_static_libs: [
"libcharger_sysprop",
],
},
},
export_static_lib_headers: [
"android.hardware.health-V1-ndk",
],
}
cc_library_static {