Merge tag 'android-11.0.0_r48' into int/11/fp3
Android 11.0.0 Release 48 (RD2A.211001.002)
* tag 'android-11.0.0_r48':
Rip out getProcessAgeMs.
getProcessAgeMs: better error messages
Change-Id: Ie7d45690226ef4a469236439ec9255e3e77943e7
diff --git a/Android.bp b/Android.bp
index e0ca9e2..475fb8c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -116,7 +116,8 @@
name: "libhidltransport",
vendor_available: true,
- visibility: [":__subpackages__"],
+// TODO(b/144056694) Add back this visibility restriction.
+// visibility: [":__subpackages__"],
}
cc_defaults {
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 8c796b2..54c3b60 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -14,3 +14,26 @@
],
gen_java: true,
}
+
+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 c91dcd2..1a065c0 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -15,3 +15,25 @@
],
gen_java: true,
}
+
+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",
+ ],
+}