commit 6fcfb8aa53a9cbff7361e3b42a85379434acdf62
author Steven Moreland <smoreland@google.com> Thu Jun 20 13:09:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 13:09:55 2019 -0700
tree e07225776a123cd8605aa98fab025da60e549377
parent 19a13d2f4b6c7f9158d809321a97cf1e4b6a1d37
parent 873c123d18e16fd814bbc3c0a9cdb394f46718bf

Merge "libhwbinder users use libhidlbase" into qt-dev
am: 490f1cf074

Change-Id: Ib20f4dc87cb2aea1350af98be9bb65eb7575a6fd

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index d18f15a..05123af 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -93,7 +93,6 @@
     libbinderthreadstate \
     libhidltransport \
     libhidlbase \
-    libhwbinder_noltopgo \
     libhealthstoragedefault \
     libvndksupport \
     libhealthd_charger \
@@ -152,7 +151,6 @@
     libbinderthreadstate \
     libhidltransport \
     libhidlbase \
-    libhwbinder_noltopgo \
     libhealthstoragedefault \
     libvndksupport \
     libhealthd_charger_nops \

libmemunreachable/Android.bp

diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 62a7266..f1abdd2 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -111,7 +111,7 @@
     static_libs: ["libmemunreachable"],
     shared_libs: [
         "libbinder",
-        "libhwbinder",
+        "libhidlbase",
         "libutils",
     ],
     test_suites: ["device-tests"],