Merge changes from topic "health_recovery_available" into stage-aosp-master
* changes:
health@2.0-impl: recovery_available: true
health: libhealthstoragedefault: recovery_available
diff --git a/health/1.0/default/Android.bp b/health/1.0/default/Android.bp
index cb2e87d..8fbb8c3 100644
--- a/health/1.0/default/Android.bp
+++ b/health/1.0/default/Android.bp
@@ -1,6 +1,7 @@
cc_library_static {
name: "android.hardware.health@1.0-convert",
vendor_available: true,
+ recovery_available: true,
srcs: ["convert.cpp"],
include_dirs: [
"system/core/base/include",
diff --git a/health/2.0/default/Android.bp b/health/2.0/default/Android.bp
index 03aa77b..6301a06 100644
--- a/health/2.0/default/Android.bp
+++ b/health/2.0/default/Android.bp
@@ -1,6 +1,9 @@
+// Helper library for implementing health HAL. It is recommended that a health
+// service or passthrough HAL link to this library.
cc_library_static {
name: "android.hardware.health@2.0-impl",
vendor_available: true,
+ recovery_available: true,
srcs: [
"Health.cpp",
"healthd_common.cpp",
diff --git a/health/2.0/utils/libhealthstoragedefault/Android.bp b/health/2.0/utils/libhealthstoragedefault/Android.bp
index cef04fe..5bc8b9f 100644
--- a/health/2.0/utils/libhealthstoragedefault/Android.bp
+++ b/health/2.0/utils/libhealthstoragedefault/Android.bp
@@ -21,6 +21,7 @@
srcs: ["StorageHealthDefault.cpp"],
name: "libhealthstoragedefault",
vendor_available: true,
+ recovery_available: true,
cflags: ["-Werror"],
shared_libs: [
"android.hardware.health@2.0",