Combine libhwbinder into libhidlbase.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release

am: 9f53eda37f

Change-Id: I2904eafad59ec5772a3e5d1fc2a75123dbcae25e

1 files 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",
     ],
 }