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

Commit 345bac07 authored Jul 18, 2018 by Yifan Hong Committed by Android (Google) Code Review Jul 18, 2018

Merge changes from topic "health_recovery_available" into stage-aosp-master

* changes:
  health@2.0-impl: recovery_available: true
  health: libhealthstoragedefault: recovery_available

parents 2fd89193 ad35b356

health/1.0/default/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	cc_library_static {		cc_library_static {
	name: "android.hardware.health@1.0-convert",		name: "android.hardware.health@1.0-convert",
	vendor_available: true,		vendor_available: true,
			recovery_available: true,
	srcs: ["convert.cpp"],		srcs: ["convert.cpp"],
	include_dirs: [		include_dirs: [
	"system/core/base/include",		"system/core/base/include",

health/2.0/default/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
			// Helper library for implementing health HAL. It is recommended that a health
			// service or passthrough HAL link to this library.
	cc_library_static {		cc_library_static {
	name: "android.hardware.health@2.0-impl",		name: "android.hardware.health@2.0-impl",
	vendor_available: true,		vendor_available: true,
			recovery_available: true,
	srcs: [		srcs: [
	"Health.cpp",		"Health.cpp",
	"healthd_common.cpp",		"healthd_common.cpp",

health/2.0/utils/libhealthstoragedefault/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ cc_library_static {
	srcs: ["StorageHealthDefault.cpp"],		srcs: ["StorageHealthDefault.cpp"],
	name: "libhealthstoragedefault",		name: "libhealthstoragedefault",
	vendor_available: true,		vendor_available: true,
			recovery_available: true,
	cflags: ["-Werror"],		cflags: ["-Werror"],
	shared_libs: [		shared_libs: [
	"android.hardware.health@2.0",		"android.hardware.health@2.0",