commit affa24f28fc814a2b0a3f1bcc1beee884bfed89f
author Yifan Hong <elsk@google.com> Fri Jan 19 15:53:25 2018 -0800
committer Yifan Hong <elsk@google.com> Mon Jan 22 12:34:04 2018 -0800
tree ccb69b4d4dab7895d004fafc767dbfb662e7eea6
parent 1c08d5049f9297986206f7d9cb34b4c09ae2bbd2

healthd: move HealthServiceCommon

... to hardware/interfaces. HealthServiceCommon
becomes two separate libraries:
- libhealthservicedefault for services on vendor
- libhealthservicehealthd for healthd

Test: boots
Bug: 63702641
Change-Id: Ibc7096328bb36356cb653e542bab900cd046fe8a

healthd/Android.bp

diff --git a/healthd/Android.bp b/healthd/Android.bp
index df12ff0..c70278a 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -26,12 +26,10 @@
     vendor: true,
     relative_install_path: "hw",
     srcs: [
-        "HealthServiceCommon.cpp",
         "HealthServiceDefault.cpp",
     ],
 
     cflags: [
-        "-DHEALTH_INSTANCE_NAME=\"default\"",
         "-Wall",
         "-Werror",
     ],
@@ -39,6 +37,7 @@
     static_libs: [
         "android.hardware.health@2.0-impl",
         "android.hardware.health@1.0-convert",
+        "libhealthservice",
         "libhealthstoragedefault",
         "libbatterymonitor",
     ],
@@ -58,13 +57,11 @@
 cc_binary {
     name: "healthd",
     srcs: [
-        "HealthServiceCommon.cpp",
         "HealthServiceHealthd.cpp",
     ],
     local_include_dirs: ["include"],
 
     cflags: [
-        "-DHEALTH_INSTANCE_NAME=\"backup\"",
         "-Wall",
         "-Werror",
     ],
@@ -72,6 +69,7 @@
     static_libs: [
         "android.hardware.health@2.0-impl",
         "android.hardware.health@1.0-convert",
+        "libhealthservice",
         "libbatterymonitor",
         "libhealthstoragedefault",
     ],