commit e84fcedabae334c581d2e9da4f2aacf4b6de387c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 18 21:55:59 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 18 21:55:59 2018 +0000
tree 537a63c19968bd270d1c7edf7fd3d8fa00d12066
parent c7a9302e10b02244ae07ded358ce7a304ee43db2
parent c3e4bafd92e0353b35d9e2fbd27b57af53077c71

Merge "healthd: uses android.hardware.health@2.0-service_defaults" into stage-aosp-master

healthd/Android.bp

diff --git a/healthd/Android.bp b/healthd/Android.bp
index eb8dbe6..6b00f81 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -24,12 +24,6 @@
 
 cc_defaults {
     name: "android.hardware.health@2.0-service_defaults",
-    init_rc: ["android.hardware.health@2.0-service.rc"],
-    vendor: true,
-    relative_install_path: "hw",
-    srcs: [
-        "HealthServiceDefault.cpp",
-    ],
 
     cflags: [
         "-Wall",
@@ -60,6 +54,13 @@
     name: "android.hardware.health@2.0-service",
     defaults: ["android.hardware.health@2.0-service_defaults"],
 
+    vendor: true,
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.health@2.0-service.rc"],
+    srcs: [
+        "HealthServiceDefault.cpp",
+    ],
+
     overrides: [
         "healthd",
     ]
@@ -67,35 +68,16 @@
 
 cc_binary {
     name: "healthd",
+    defaults: ["android.hardware.health@2.0-service_defaults"],
+
     init_rc: ["healthd.rc"],
     srcs: [
         "HealthServiceHealthd.cpp",
     ],
     local_include_dirs: ["include"],
 
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-
-    static_libs: [
-        "android.hardware.health@2.0-impl",
-        "android.hardware.health@1.0-convert",
-        "libhealthservice",
-        "libbatterymonitor",
-        "libhealthstoragedefault",
-    ],
-
     shared_libs: [
-        "libbase",
-        "libcutils",
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "liblog",
-        "libutils",
         "android.hardware.health@1.0",
-        "android.hardware.health@2.0",
     ],
 
     vintf_fragments: [