Merge "healthd: uses android.hardware.health@2.0-service_defaults" into stage-aosp-master (83482709) · Commits · e / os / android_system_core

healthd/Android.bp

+9 −27

Original line number	Diff line number	Diff line
		@@ -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: [