Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

Index: third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
index f279ef8934b1940600c37486d68e6f9667a737c2..ad8980dd5030cbe4ac8d6fb196a456eb9b4f894f 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
@@ -22,6 +22,8 @@
 
 
 GENERATOR_PREFIX = 'java'
+
+_HEADER_SIZE = 8
 
 _spec_to_java_type = {
   mojom.BOOL.spec: 'boolean',
@@ -346,6 +348,14 @@
   sub_kind = kind.kind
   return mojom.IsObjectKind(sub_kind)
 
+def GetResponseStructFromMethod(method):
+  return generator.GetDataHeader(
+      False, generator.GetResponseStructFromMethod(method))
+
+def GetStructFromMethod(method):
+  return generator.GetDataHeader(
+      False, generator.GetStructFromMethod(method))
+
 def GetConstantsMainEntityName(module):
   if module.attributes and 'JavaConstantsClassName' in module.attributes:
     return ParseStringAttribute(module.attributes['JavaConstantsClassName'])
@@ -410,8 +420,9 @@
     'method_ordinal_name': GetMethodOrdinalName,
     'name': GetNameForElement,
     'new_array': NewArray,
-    'response_struct_from_method': generator.GetResponseStructFromMethod,
-    'struct_from_method': generator.GetStructFromMethod,
+    'response_struct_from_method': GetResponseStructFromMethod,
+    'struct_from_method': GetStructFromMethod,
+    'struct_size': lambda ps: ps.GetTotalSize() + _HEADER_SIZE,
   }
 
   def GetJinjaExports(self):