Move GrantorDescriptor definition out of MQDescriptor
The definition is being moved to MQDescriptorBase in libfmq.
Test: atest fmq_unit_tests &&
system/tools/hidl/tests/run_all_device_tests.sh && m -j64
Bug: 142326204
Change-Id: I40469c76cdd544b496a284219190424ed7e049d9
diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h
index 6a0bc25..786c1be 100644
--- a/base/include/hidl/MQDescriptor.h
+++ b/base/include/hidl/MQDescriptor.h
@@ -27,20 +27,6 @@
namespace android {
namespace hardware {
-struct GrantorDescriptor {
- uint32_t flags __attribute__ ((aligned(4)));
- uint32_t fdIndex __attribute__ ((aligned(4)));
- uint32_t offset __attribute__ ((aligned(4)));
- uint64_t extent __attribute__ ((aligned(8)));
-};
-
-static_assert(offsetof(GrantorDescriptor, flags) == 0, "wrong offset");
-static_assert(offsetof(GrantorDescriptor, fdIndex) == 4, "wrong offset");
-static_assert(offsetof(GrantorDescriptor, offset) == 8, "wrong offset");
-static_assert(offsetof(GrantorDescriptor, extent) == 16, "wrong offset");
-static_assert(sizeof(GrantorDescriptor) == 24, "wrong size");
-static_assert(__alignof(GrantorDescriptor) == 8, "wrong alignment");
-
template <typename T, MQFlavor flavor>
struct MQDescriptor {
// Takes ownership of handle