Merge t-qpr-2022-12
Change-Id: Ief77a6a3f8575a25b4e0c249d39614d9e5069af4
diff --git a/Android.bp b/Android.bp
index 2b9e80f..738258e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -124,12 +124,13 @@
name: "libhidltransport",
vendor_available: true,
- visibility: [
- ":__subpackages__",
- "//hardware:__subpackages__",
- "//test/sts:__subpackages__",
- "//vendor:__subpackages__",
- ],
+ // TODO(b/144056694) Add back the subpackages visibility restriction.
+ // visibility: [
+ // ":__subpackages__",
+ // "//hardware:__subpackages__",
+ // "//test/sts:__subpackages__",
+ // "//vendor:__subpackages__",
+ // ],
}
cc_defaults {
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 461f7e7..08440fc 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -24,3 +24,26 @@
"//apex_available:platform",
],
}
+
+cc_library_shared {
+ name: "android.hidl.base@1.0",
+ generated_sources: ["android.hidl.base@1.0_genc++"],
+ generated_headers: ["android.hidl.base@1.0_genc++_headers"],
+ export_generated_headers: ["android.hidl.base@1.0_genc++_headers"],
+ system_ext_specific: true,
+ vendor_available: true,
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ ],
+}
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index 4a84b86..0597c8d 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -25,3 +25,25 @@
"//apex_available:platform",
],
}
+
+cc_library_shared {
+ name: "android.hidl.manager@1.0",
+ generated_sources: ["android.hidl.manager@1.0_genc++"],
+ generated_headers: ["android.hidl.manager@1.0_genc++_headers"],
+ export_generated_headers: ["android.hidl.manager@1.0_genc++_headers"],
+ vendor_available: true,
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ ],
+}