commit 20d21db0dd190fb39f656bbce92a66f345e120ff
author Yifan Hong <elsk@google.com> Wed Jul 18 13:06:46 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 18 13:06:46 2018 -0700
tree 68c08a916f83d33466a2e76cd574cb2392361229
parent 8b1dac4e8bdaafa745f07ff21703587b52fa32f7
parent 345bac071eb1a08429665aa27654bf48bf998dd8

Merge changes from topic "health_recovery_available" into stage-aosp-master
am: 345bac071e

Change-Id: Ida802a4eae6b860da0ad43e1b6af6dac31f1ef73

health/1.0/default/Android.bp

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",

health/2.0/default/Android.bp

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",