Merge "recovery uses IHealth::getService"

2018-08-14 21:06:58 +00:00
parent c205dd9d43 056538c0a9
commit ce2f0d85fb
3 changed files with 32 additions and 62 deletions
@@ -104,6 +104,7 @@ cc_defaults {
    ],

    shared_libs: [
+        "android.hardware.health@2.0",
        "libbase",
        "libbootloader_message",
        "libcrypto",
@@ -112,6 +113,8 @@ cc_defaults {
        "libfs_mgr",
        "libfusesideload",
        "libhidl-gen-utils",
+        "libhidlbase",
+        "libhidltransport",
        "liblog",
        "libpng",
        "libselinux",
@@ -125,20 +128,11 @@ cc_defaults {
        "libminui",
        "libverifier",
        "libotautil",
+
+        // external dependencies
+        "libhealthhalutils",
        "libvintf_recovery",
        "libvintf",
-
-        // TODO(b/80132328): Remove the dependency on static health HAL.
-        "libhealthd.default",
-        "android.hardware.health@2.0-impl",
-        "android.hardware.health@2.0",
-        "android.hardware.health@1.0",
-        "android.hardware.health@1.0-convert",
-        "libhealthstoragedefault",
-        "libhidltransport",
-        "libhidlbase",
-        "libhwbinder_noltopgo",
-        "libbatterymonitor",
    ],
 }