Snap for 5681502 from 87d7ad9d8fe6cbb0405983b37ff9e79927451bc7 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release

Change-Id: I8fb2e10cf81366b198ea9496b5a508c548a5829e

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