From aedef73b9c4f6b95b6739f766e5cc70ab892b879 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 17 Jun 2019 17:20:03 -0700
Subject: [PATCH] libhwbinder users use libhidlbase

libhwbinder symbols are being moved into libhidlbase in order to
optimize linking/memory usage. libhwbinder will no longer be
required in the future (however removing references to it will come
separately).

Bug: 134961554
Test: boot
Change-Id: I2b9a4fb9d87913b6c0e4291d3debadbf27511111
---
 healthd/Android.mk           | 2 --
 libmemunreachable/Android.bp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/healthd/Android.mk b/healthd/Android.mk
index d18f15a0c..05123af80 100644
--- 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 \
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index b78a4c435..8f01e5015 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -96,7 +96,7 @@ cc_test {
     static_libs: ["libmemunreachable"],
     shared_libs: [
         "libbinder",
-        "libhwbinder",
+        "libhidlbase",
         "libutils",
     ],
     test_suites: ["device-tests"],