From 3a39eec3076d296d550c4eb57590cf7fb0f06bd3 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 27 Apr 2018 15:03:32 -0700
Subject: healthd use vintf_fragments

This encourages device manufacturers to use
service.override over service and to remove healthd
on device, because it is one less step to do.

Test: make VINTF metadata
Bug: 66917623
Bug: 77541952
Bug: 79107699
Change-Id: I1cac3570f64a0308b1f2d465205f98a97e4b4320
Merged-In: I1cac3570f64a0308b1f2d465205f98a97e4b4320
(cherry picked from commit 2db565d75f81031ea0dfe5693ab0fe02714c2b88)
---
 healthd/Android.bp           | 12 +++---------
 healthd/manifest_healthd.xml | 11 +++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 healthd/manifest_healthd.xml

(limited to 'healthd')

diff --git a/healthd/Android.bp b/healthd/Android.bp
index cefe09d5e..49d53503b 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -59,15 +59,6 @@ cc_binary {
     defaults: ["android.hardware.health@2.0-service_defaults"],
 }
 
-cc_binary {
-    name: "android.hardware.health@2.0-service.override",
-    defaults: ["android.hardware.health@2.0-service_defaults"],
-
-    overrides: [
-        "healthd",
-    ],
-}
-
 cc_binary {
     name: "healthd",
     init_rc: ["healthd.rc"],
@@ -101,4 +92,7 @@ cc_binary {
         "android.hardware.health@2.0",
     ],
 
+    vintf_fragments: [
+        "manifest_healthd.xml"
+    ],
 }
diff --git a/healthd/manifest_healthd.xml b/healthd/manifest_healthd.xml
new file mode 100644
index 000000000..097a7d87a
--- /dev/null
+++ b/healthd/manifest_healthd.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="framework">
+    <hal>
+        <name>android.hardware.health</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>backup</instance>
+        </interface>
+    </hal>
+</manifest>
-- 
cgit v1.2.3