commit cded900b96f819d9d9a47ff6e0c67fcea506cad0
author Yifan Hong <elsk@google.com> Mon Nov 06 16:47:54 2017 -0800
committer Yifan Hong <elsk@google.com> Tue Nov 07 14:03:15 2017 -0800
tree 79f3a5584a78b235aa16292e6efeb7d320a250e6
parent 0700f3b863d79c8687d8925af321b600da61a3b3

Refactor common code between healthd and health@2.0-service

Use healthd_board_* functions for the
code that's different between them.

Bug: 65990106
Test: boots
Test: VTS tests on healthd and health service
Change-Id: I88e6f210cb91c0cf08a9d7c52910c38fa9a75130

healthd/Android.bp

diff --git a/healthd/Android.bp b/healthd/Android.bp
index 4b3274c..21c0ef0 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -53,7 +53,10 @@
     init_rc: ["android.hardware.health@2.0-service.rc"],
     vendor: true,
     relative_install_path: "hw",
-    srcs: ["HealthService.cpp"],
+    srcs: [
+        "HealthServiceCommon.cpp",
+        "HealthServiceDefault.cpp",
+    ],
 
     cflags: ["-DHEALTH_INSTANCE_NAME=\"default\""],
 
@@ -77,7 +80,10 @@
 
 cc_binary {
     name: "healthd",
-    srcs: ["HealthService.cpp"],
+    srcs: [
+        "HealthServiceCommon.cpp",
+        "HealthServiceHealthd.cpp",
+    ],
     local_include_dirs: ["include"],
 
     cflags: ["-DHEALTH_INSTANCE_NAME=\"backup\""],