Merge "Make hybrid interface descriptors StaticString16"
diff --git a/Android.bp b/Android.bp
index c0058ef..29f9b56 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,7 +26,6 @@
name: "libhidl",
required: [
"libhidlbase",
- "libhidltransport",
],
}
@@ -46,8 +45,6 @@
"android.hidl.memory@1.0",
"libbase",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
"libcutils",
@@ -102,6 +99,8 @@
whole_static_libs: [
"libhwbinder_pgo-impl-internal",
],
+
+ visibility: ["//system/libhwbinder:__subpackages__"],
}
// WARNING: deprecated
diff --git a/adapter/Android.bp b/adapter/Android.bp
index eb322bc..ae801bc 100644
--- a/adapter/Android.bp
+++ b/adapter/Android.bp
@@ -23,14 +23,11 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
],
export_shared_lib_headers: [
"libhidlbase",
- "libhidltransport",
"libutils",
],
}
diff --git a/base/Android.bp b/base/Android.bp
index 8fe2702..0bc3af0 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -53,4 +53,6 @@
cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"],
},
},
+
+ visibility: ["//system/libhidl:__subpackages__"],
}
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 2135ef3..2f97d5d 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -26,7 +26,6 @@
"libutils",
"libcutils",
"libhidlbase",
- "libhidltransport",
"android.hidl.memory@1.0",
"android.hidl.memory.token@1.0",
],
diff --git a/transport/Android.bp b/transport/Android.bp
index 50f277e..29c820a 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -94,4 +94,6 @@
cflags: ["-DENFORCE_VINTF_MANIFEST"]
},
},
+
+ visibility: ["//system/libhidl:__subpackages__"],
}
diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp
index 1fdfb26..1116f1d 100644
--- a/transport/allocator/1.0/default/Android.bp
+++ b/transport/allocator/1.0/default/Android.bp
@@ -26,8 +26,6 @@
shared_libs: [
"android.hidl.allocator@1.0",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libbase",
"liblog",
"libutils",
diff --git a/transport/allocator/1.0/utils/Android.bp b/transport/allocator/1.0/utils/Android.bp
index 9f70963..b324ef1 100644
--- a/transport/allocator/1.0/utils/Android.bp
+++ b/transport/allocator/1.0/utils/Android.bp
@@ -24,7 +24,6 @@
"libbinder",
"libcutils",
"libhidlbase",
- "libhidltransport",
"android.hidl.memory@1.0"
],
export_include_dirs: ["include"],
diff --git a/transport/base/1.0/vts/functional/Android.bp b/transport/base/1.0/vts/functional/Android.bp
index fb9af33..38b03f7 100644
--- a/transport/base/1.0/vts/functional/Android.bp
+++ b/transport/base/1.0/vts/functional/Android.bp
@@ -24,8 +24,6 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libutils",
"libprotobuf-cpp-lite",
diff --git a/transport/memory/1.0/default/Android.bp b/transport/memory/1.0/default/Android.bp
index d242ddf..f56ee95 100644
--- a/transport/memory/1.0/default/Android.bp
+++ b/transport/memory/1.0/default/Android.bp
@@ -29,12 +29,10 @@
],
shared_libs: [
"libcutils",
- "libhwbinder",
"libbase",
"liblog",
"libutils",
"libhidlbase",
- "libhidltransport",
"android.hidl.memory@1.0",
],
}