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

Merge "healthd: uses android.hardware.health@2.0-service_defaults" into stage-aosp-master

Browse source
This commit is contained in:
TreeHugger Robot 2018-07-18 21:55:59 +00:00 • committed by Android (Google) Code Review
commit 834827095e
1 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
healthd/Android.bp
View file

@ -24,12 +24,6 @@ cc_library_static {
cc_defaults {
name: "android.hardware.health@2.0-service_defaults",
init_rc: ["android.hardware.health@2.0-service.rc"],
vendor: true,
relative_install_path: "hw",
srcs: [
"HealthServiceDefault.cpp",
],
cflags: [
"-Wall",
@ -60,6 +54,13 @@ cc_binary {
name: "android.hardware.health@2.0-service",
defaults: ["android.hardware.health@2.0-service_defaults"],
vendor: true,
relative_install_path: "hw",
init_rc: ["android.hardware.health@2.0-service.rc"],
srcs: [
"HealthServiceDefault.cpp",
],
overrides: [
"healthd",
]
@ -67,35 +68,16 @@ cc_binary {
cc_binary {
name: "healthd",
defaults: ["android.hardware.health@2.0-service_defaults"],
init_rc: ["healthd.rc"],
srcs: [
"HealthServiceHealthd.cpp",
],
local_include_dirs: ["include"],
cflags: [
"-Wall",
"-Werror",
],
static_libs: [
"android.hardware.health@2.0-impl",
"android.hardware.health@1.0-convert",
"libhealthservice",
"libbatterymonitor",
"libhealthstoragedefault",
],
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.health@1.0",
"android.hardware.health@2.0",
],
vintf_fragments: [