From 9f53eda37fe905211ce6546d32784e7f4d980614 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 17 Jun 2019 17:17:02 -0700
Subject: Combine libhwbinder into libhidlbase.

For memory.

Bug: 134961554
Test: boot

Change-Id: I18b61e8d3a3cb1fd30a8d04edfefaf93be5f0211
---
 Android.bp | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 084763c..727f07f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,23 +47,47 @@ cc_test {
     ],
 }
 
+cc_defaults {
+    name: "libhidlbase-combined-impl",
+
+    defaults: [
+        "libhwbinder-impl-shared-libs",
+        "libhidlbase-impl-shared-libs",
+        "libhidltransport-impl-shared-libs",
+    ],
+
+    whole_static_libs: [
+        "libhidlbase-impl-internal",
+        "libhidltransport-impl-internal",
+    ],
+}
+
 cc_library {
     name: "libhidlbase",
+    defaults: ["libhidlbase-combined-impl"],
     recovery_available: true,
     vendor_available: true,
     vndk: {
         enabled: true,
         support_system_process: true,
     },
+    whole_static_libs: [
+        "libhwbinder-impl-internal",
+    ],
+}
 
+// Only libhwbinder_benchmark needs to have pgo enabled. When all places
+// support having PGO selectively enabled, all places can use libhwbinder.
+//
+// http://b/77320844
+cc_library {
+    name: "libhidlbase_pgo",
     defaults: [
-        "libhidlbase-impl-shared-libs",
-        "libhidltransport-impl-shared-libs",
+        "libhidlbase-combined-impl",
+        "hwbinder_benchmark_pgo",
     ],
-
     whole_static_libs: [
-        "libhidlbase-impl-internal",
-        "libhidltransport-impl-internal",
+        "libhwbinder_pgo-impl-internal",
     ],
 }
 
-- 
cgit v1.2.3