Merge "libhwbinder users use libhidlbase" into qt-dev

am: 490f1cf074 Change-Id: Ib20f4dc87cb2aea1350af98be9bb65eb7575a6fd
2019-06-20 13:09:55 -07:00 · 2019-06-20 13:09:55 -07:00 · 451e764bdc
parent 18938fd196 490f1cf074
commit 451e764bdc
2 changed files with 1 additions and 3 deletions
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@ -93,7 +93,6 @@ CHARGER_STATIC_LIBRARIES := \
    libbinderthreadstate \
    libhidltransport \
    libhidlbase \
-    libhwbinder_noltopgo \
    libhealthstoragedefault \
    libvndksupport \
    libhealthd_charger \
@ -152,7 +151,6 @@ LOCAL_STATIC_LIBRARIES := \
    libbinderthreadstate \
    libhidltransport \
    libhidlbase \
-    libhwbinder_noltopgo \
    libhealthstoragedefault \
    libvndksupport \
    libhealthd_charger_nops \
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@ -111,7 +111,7 @@ cc_test {
    static_libs: ["libmemunreachable"],
    shared_libs: [
        "libbinder",
-        "libhwbinder",
+        "libhidlbase",
        "libutils",
    ],
    test_suites: ["device-tests"],