Snap for 5681502 from 87d7ad9d8fe6cbb0405983b37ff9e79927451bc7 to qt-qpr1-release
Change-Id: I8fb2e10cf81366b198ea9496b5a508c548a5829e
diff --git a/Android.bp b/Android.bp
index 084763c..727f07f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,16 +47,11 @@
],
}
-cc_library {
- name: "libhidlbase",
- recovery_available: true,
- vendor_available: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
+cc_defaults {
+ name: "libhidlbase-combined-impl",
defaults: [
+ "libhwbinder-impl-shared-libs",
"libhidlbase-impl-shared-libs",
"libhidltransport-impl-shared-libs",
],
@@ -67,6 +62,35 @@
],
}
+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-combined-impl",
+ "hwbinder_benchmark_pgo",
+ ],
+ whole_static_libs: [
+ "libhwbinder_pgo-impl-internal",
+ ],
+}
+
// WARNING: deprecated
// This library is no longer required, and dependencies should be taken
// on libhidlbase instead.
