grpc 1.42.0 → 1.43.1

data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c

@@ -8,22 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/value.upbdefs.h"
+#include "envoy/type/matcher/v3/value.upb.h"
 
 extern upb_def_init envoy_type_matcher_v3_number_proto_upbdefinit;
 extern upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_type_matcher_v3_ValueMatcher_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_ListMatcher_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &envoy_type_matcher_v3_ValueMatcher_msginit,
-  &envoy_type_matcher_v3_ValueMatcher_NullMatch_msginit,
-  &envoy_type_matcher_v3_ListMatcher_msginit,
-};
-
 static const char descriptor[942] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 
 'a', 'l', 'u', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 
 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 
@@ -75,7 +66,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_type_matcher_v3_value_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_value_proto_upb_file_layout,
   "envoy/type/matcher/v3/value.proto",
   UPB_STRVIEW_INIT(descriptor, 942)
 };

data/src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c

@@ -8,28 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/type/metadata/v3/metadata.upbdefs.h"
+#include "envoy/type/metadata/v3/metadata.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKey_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKey_PathSegment_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKind_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKind_Request_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKind_Route_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKind_Cluster_msginit;
-extern const upb_msglayout envoy_type_metadata_v3_MetadataKind_Host_msginit;
-
-static const upb_msglayout *layouts[7] = {
-  &envoy_type_metadata_v3_MetadataKey_msginit,
-  &envoy_type_metadata_v3_MetadataKey_PathSegment_msginit,
-  &envoy_type_metadata_v3_MetadataKind_msginit,
-  &envoy_type_metadata_v3_MetadataKind_Request_msginit,
-  &envoy_type_metadata_v3_MetadataKind_Route_msginit,
-  &envoy_type_metadata_v3_MetadataKind_Cluster_msginit,
-  &envoy_type_metadata_v3_MetadataKind_Host_msginit,
-};
-
 static const char descriptor[1104] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '/', 'v', '3', '/', 
 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 
 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 
@@ -86,7 +69,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_type_metadata_v3_metadata_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_metadata_v3_metadata_proto_upb_file_layout,
   "envoy/type/metadata/v3/metadata.proto",
   UPB_STRVIEW_INIT(descriptor, 1104)
 };

data/src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c

@@ -8,25 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/tracing/v3/custom_tag.upbdefs.h"
+#include "envoy/type/tracing/v3/custom_tag.upb.h"
 
 extern upb_def_init envoy_type_metadata_v3_metadata_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_type_tracing_v3_CustomTag_msginit;
-extern const upb_msglayout envoy_type_tracing_v3_CustomTag_Literal_msginit;
-extern const upb_msglayout envoy_type_tracing_v3_CustomTag_Environment_msginit;
-extern const upb_msglayout envoy_type_tracing_v3_CustomTag_Header_msginit;
-extern const upb_msglayout envoy_type_tracing_v3_CustomTag_Metadata_msginit;
-
-static const upb_msglayout *layouts[5] = {
-  &envoy_type_tracing_v3_CustomTag_msginit,
-  &envoy_type_tracing_v3_CustomTag_Literal_msginit,
-  &envoy_type_tracing_v3_CustomTag_Environment_msginit,
-  &envoy_type_tracing_v3_CustomTag_Header_msginit,
-  &envoy_type_tracing_v3_CustomTag_Metadata_msginit,
-};
-
 static const char descriptor[1249] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 't', 'r', 'a', 'c', 'i', 'n', 'g', '/', 'v', '3', '/', 'c', 
 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 
 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '\032', '%', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', 
@@ -89,7 +76,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_tracing_v3_custom_tag_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_tracing_v3_custom_tag_proto_upb_file_layout,
   "envoy/type/tracing/v3/custom_tag.proto",
   UPB_STRVIEW_INIT(descriptor, 1249)
 };

data/src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c

@@ -8,9 +8,9 @@
 
 #include "upb/def.h"
 #include "envoy/type/v3/http.upbdefs.h"
+#include "envoy/type/v3/http.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
-
 static const char descriptor[184] = {'\n', '\030', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 
 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 
 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '*', '2', '\n', 
@@ -28,7 +28,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init envoy_type_v3_http_proto_upbdefinit = {
   deps,
-  NULL,
+  &envoy_type_v3_http_proto_upb_file_layout,
   "envoy/type/v3/http.proto",
   UPB_STRVIEW_INIT(descriptor, 184)
 };

data/src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c

@@ -8,18 +8,11 @@
 
 #include "upb/def.h"
 #include "envoy/type/v3/percent.upbdefs.h"
+#include "envoy/type/v3/percent.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_type_v3_Percent_msginit;
-extern const upb_msglayout envoy_type_v3_FractionalPercent_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_type_v3_Percent_msginit,
-  &envoy_type_v3_FractionalPercent_msginit,
-};
-
 static const char descriptor[529] = {'\n', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 
 'r', 'o', 't', 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', 
 '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', 
@@ -53,7 +46,7 @@ static upb_def_init *deps[4] = {
 
 upb_def_init envoy_type_v3_percent_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_v3_percent_proto_upb_file_layout,
   "envoy/type/v3/percent.proto",
   UPB_STRVIEW_INIT(descriptor, 529)
 };

data/src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c

@@ -8,19 +8,10 @@
 
 #include "upb/def.h"
 #include "envoy/type/v3/range.upbdefs.h"
+#include "envoy/type/v3/range.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_type_v3_Int64Range_msginit;
-extern const upb_msglayout envoy_type_v3_Int32Range_msginit;
-extern const upb_msglayout envoy_type_v3_DoubleRange_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &envoy_type_v3_Int64Range_msginit,
-  &envoy_type_v3_Int32Range_msginit,
-  &envoy_type_v3_DoubleRange_msginit,
-};
-
 static const char descriptor[423] = {'\n', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 
 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 
@@ -48,7 +39,7 @@ static upb_def_init *deps[3] = {
 
 upb_def_init envoy_type_v3_range_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_v3_range_proto_upb_file_layout,
   "envoy/type/v3/range.proto",
   UPB_STRVIEW_INIT(descriptor, 423)
 };

data/src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c

@@ -8,15 +8,10 @@
 
 #include "upb/def.h"
 #include "envoy/type/v3/semantic_version.upbdefs.h"
+#include "envoy/type/v3/semantic_version.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_type_v3_SemanticVersion_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_type_v3_SemanticVersion_msginit,
-};
-
 static const char descriptor[337] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '_', 
 'v', 'e', 'r', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\r', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', 
 '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 
@@ -41,7 +36,7 @@ static upb_def_init *deps[3] = {
 
 upb_def_init envoy_type_v3_semantic_version_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_v3_semantic_version_proto_upb_file_layout,
   "envoy/type/v3/semantic_version.proto",
   UPB_STRVIEW_INIT(descriptor, 337)
 };

data/src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c

@@ -8,10 +8,10 @@
 
 #include "upb/def.h"
 #include "google/api/annotations.upbdefs.h"
+#include "google/api/annotations.upb.h"
 
 extern upb_def_init google_api_http_proto_upbdefinit;
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-
 static const char descriptor[296] = {'\n', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 
 'p', 'r', 'o', 't', 'o', '\022', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '\032', '\025', 'g', 'o', 'o', 'g', 'l', 'e', 
 '/', 'a', 'p', 'i', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 
@@ -34,7 +34,7 @@ static upb_def_init *deps[3] = {
 
 upb_def_init google_api_annotations_proto_upbdefinit = {
   deps,
-  NULL,
+  &google_api_annotations_proto_upb_file_layout,
   "google/api/annotations.proto",
   UPB_STRVIEW_INIT(descriptor, 296)
 };

data/src/core/ext/upbdefs-generated/google/api/http.upbdefs.c

@@ -8,16 +8,7 @@
 
 #include "upb/def.h"
 #include "google/api/http.upbdefs.h"
-
-extern const upb_msglayout google_api_Http_msginit;
-extern const upb_msglayout google_api_HttpRule_msginit;
-extern const upb_msglayout google_api_CustomHttpPattern_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &google_api_Http_msginit,
-  &google_api_HttpRule_msginit,
-  &google_api_CustomHttpPattern_msginit,
-};
+#include "google/api/http.upb.h"
 
 static const char descriptor[684] = {'\n', '\025', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'h', 't', 't', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\n', 
 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '\"', 'y', '\n', '\004', 'H', 't', 't', 'p', '\022', '*', '\n', '\005', 'r', 'u', 'l', 
@@ -55,7 +46,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_api_http_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_api_http_proto_upb_file_layout,
   "google/api/http.proto",
   UPB_STRVIEW_INIT(descriptor, 684)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c

@@ -8,12 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/any.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_Any_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &google_protobuf_Any_msginit,
-};
+#include "google/protobuf/any.upb.h"
 
 static const char descriptor[228] = {'\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '6', '\n', '\003', 'A', 'n', 
@@ -33,7 +28,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_any_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_any_proto_upb_file_layout,
   "google/protobuf/any.proto",
   UPB_STRVIEW_INIT(descriptor, 228)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c

@@ -8,64 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/descriptor.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_FileDescriptorSet_msginit;
-extern const upb_msglayout google_protobuf_FileDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_DescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_DescriptorProto_ExtensionRange_msginit;
-extern const upb_msglayout google_protobuf_DescriptorProto_ReservedRange_msginit;
-extern const upb_msglayout google_protobuf_ExtensionRangeOptions_msginit;
-extern const upb_msglayout google_protobuf_FieldDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_OneofDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_EnumDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit;
-extern const upb_msglayout google_protobuf_EnumValueDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_ServiceDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_MethodDescriptorProto_msginit;
-extern const upb_msglayout google_protobuf_FileOptions_msginit;
-extern const upb_msglayout google_protobuf_MessageOptions_msginit;
-extern const upb_msglayout google_protobuf_FieldOptions_msginit;
-extern const upb_msglayout google_protobuf_OneofOptions_msginit;
-extern const upb_msglayout google_protobuf_EnumOptions_msginit;
-extern const upb_msglayout google_protobuf_EnumValueOptions_msginit;
-extern const upb_msglayout google_protobuf_ServiceOptions_msginit;
-extern const upb_msglayout google_protobuf_MethodOptions_msginit;
-extern const upb_msglayout google_protobuf_UninterpretedOption_msginit;
-extern const upb_msglayout google_protobuf_UninterpretedOption_NamePart_msginit;
-extern const upb_msglayout google_protobuf_SourceCodeInfo_msginit;
-extern const upb_msglayout google_protobuf_SourceCodeInfo_Location_msginit;
-extern const upb_msglayout google_protobuf_GeneratedCodeInfo_msginit;
-extern const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit;
-
-static const upb_msglayout *layouts[27] = {
-  &google_protobuf_FileDescriptorSet_msginit,
-  &google_protobuf_FileDescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_ExtensionRange_msginit,
-  &google_protobuf_DescriptorProto_ReservedRange_msginit,
-  &google_protobuf_ExtensionRangeOptions_msginit,
-  &google_protobuf_FieldDescriptorProto_msginit,
-  &google_protobuf_OneofDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit,
-  &google_protobuf_EnumValueDescriptorProto_msginit,
-  &google_protobuf_ServiceDescriptorProto_msginit,
-  &google_protobuf_MethodDescriptorProto_msginit,
-  &google_protobuf_FileOptions_msginit,
-  &google_protobuf_MessageOptions_msginit,
-  &google_protobuf_FieldOptions_msginit,
-  &google_protobuf_OneofOptions_msginit,
-  &google_protobuf_EnumOptions_msginit,
-  &google_protobuf_EnumValueOptions_msginit,
-  &google_protobuf_ServiceOptions_msginit,
-  &google_protobuf_MethodOptions_msginit,
-  &google_protobuf_UninterpretedOption_msginit,
-  &google_protobuf_UninterpretedOption_NamePart_msginit,
-  &google_protobuf_SourceCodeInfo_msginit,
-  &google_protobuf_SourceCodeInfo_Location_msginit,
-  &google_protobuf_GeneratedCodeInfo_msginit,
-  &google_protobuf_GeneratedCodeInfo_Annotation_msginit,
-};
+#include "google/protobuf/descriptor.upb.h"
 
 static const char descriptor[7619] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
@@ -380,7 +323,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_descriptor_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_descriptor_proto_upb_file_layout,
   "google/protobuf/descriptor.proto",
   UPB_STRVIEW_INIT(descriptor, 7619)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c

@@ -8,12 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/duration.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_Duration_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &google_protobuf_Duration_msginit,
-};
+#include "google/protobuf/duration.upb.h"
 
 static const char descriptor[251] = {'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 
 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
@@ -34,7 +29,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_duration_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_duration_proto_upb_file_layout,
   "google/protobuf/duration.proto",
   UPB_STRVIEW_INIT(descriptor, 251)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c

@@ -8,12 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/empty.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_Empty_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &google_protobuf_Empty_msginit,
-};
+#include "google/protobuf/empty.upb.h"
 
 static const char descriptor[190] = {'\n', '\033', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'e', 'm', 'p', 't', 'y', '.', 'p', 
 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\007', '\n', '\005', 
@@ -31,7 +26,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_empty_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_empty_proto_upb_file_layout,
   "google/protobuf/empty.proto",
   UPB_STRVIEW_INIT(descriptor, 190)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c

@@ -8,18 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/struct.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_Struct_msginit;
-extern const upb_msglayout google_protobuf_Struct_FieldsEntry_msginit;
-extern const upb_msglayout google_protobuf_Value_msginit;
-extern const upb_msglayout google_protobuf_ListValue_msginit;
-
-static const upb_msglayout *layouts[4] = {
-  &google_protobuf_Struct_msginit,
-  &google_protobuf_Struct_FieldsEntry_msginit,
-  &google_protobuf_Value_msginit,
-  &google_protobuf_ListValue_msginit,
-};
+#include "google/protobuf/struct.upb.h"
 
 static const char descriptor[738] = {'\n', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 
 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\230', '\001', 
@@ -59,7 +48,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_struct_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_struct_proto_upb_file_layout,
   "google/protobuf/struct.proto",
   UPB_STRVIEW_INIT(descriptor, 738)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c

@@ -8,12 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/timestamp.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_Timestamp_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &google_protobuf_Timestamp_msginit,
-};
+#include "google/protobuf/timestamp.upb.h"
 
 static const char descriptor[255] = {'\n', '\037', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 
 'm', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
@@ -34,7 +29,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_timestamp_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_timestamp_proto_upb_file_layout,
   "google/protobuf/timestamp.proto",
   UPB_STRVIEW_INIT(descriptor, 255)
 };

data/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c

@@ -8,28 +8,7 @@
 
 #include "upb/def.h"
 #include "google/protobuf/wrappers.upbdefs.h"
-
-extern const upb_msglayout google_protobuf_DoubleValue_msginit;
-extern const upb_msglayout google_protobuf_FloatValue_msginit;
-extern const upb_msglayout google_protobuf_Int64Value_msginit;
-extern const upb_msglayout google_protobuf_UInt64Value_msginit;
-extern const upb_msglayout google_protobuf_Int32Value_msginit;
-extern const upb_msglayout google_protobuf_UInt32Value_msginit;
-extern const upb_msglayout google_protobuf_BoolValue_msginit;
-extern const upb_msglayout google_protobuf_StringValue_msginit;
-extern const upb_msglayout google_protobuf_BytesValue_msginit;
-
-static const upb_msglayout *layouts[9] = {
-  &google_protobuf_DoubleValue_msginit,
-  &google_protobuf_FloatValue_msginit,
-  &google_protobuf_Int64Value_msginit,
-  &google_protobuf_UInt64Value_msginit,
-  &google_protobuf_Int32Value_msginit,
-  &google_protobuf_UInt32Value_msginit,
-  &google_protobuf_BoolValue_msginit,
-  &google_protobuf_StringValue_msginit,
-  &google_protobuf_BytesValue_msginit,
-};
+#include "google/protobuf/wrappers.upb.h"
 
 static const char descriptor[518] = {'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 
 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
@@ -60,7 +39,7 @@ static upb_def_init *deps[1] = {
 
 upb_def_init google_protobuf_wrappers_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_protobuf_wrappers_proto_upb_file_layout,
   "google/protobuf/wrappers.proto",
   UPB_STRVIEW_INIT(descriptor, 518)
 };

data/src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c

@@ -8,14 +8,9 @@
 
 #include "upb/def.h"
 #include "google/rpc/status.upbdefs.h"
+#include "google/rpc/status.upb.h"
 
 extern upb_def_init google_protobuf_any_proto_upbdefinit;
-extern const upb_msglayout google_rpc_Status_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &google_rpc_Status_msginit,
-};
-
 static const char descriptor[275] = {'\n', '\027', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', 
 '\022', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 
 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\"', 'f', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', 
@@ -36,7 +31,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init google_rpc_status_proto_upbdefinit = {
   deps,
-  layouts,
+  &google_rpc_status_proto_upb_file_layout,
   "google/rpc/status.proto",
   UPB_STRVIEW_INIT(descriptor, 275)
 };

data/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c

@@ -8,18 +8,9 @@
 
 #include "upb/def.h"
 #include "udpa/annotations/migrate.upbdefs.h"
+#include "udpa/annotations/migrate.upb.h"
 
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-extern const upb_msglayout udpa_annotations_MigrateAnnotation_msginit;
-extern const upb_msglayout udpa_annotations_FieldMigrateAnnotation_msginit;
-extern const upb_msglayout udpa_annotations_FileMigrateAnnotation_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &udpa_annotations_MigrateAnnotation_msginit,
-  &udpa_annotations_FieldMigrateAnnotation_msginit,
-  &udpa_annotations_FileMigrateAnnotation_msginit,
-};
-
 static const char descriptor[893] = {'\n', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 
 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', 
 '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
@@ -65,7 +56,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init udpa_annotations_migrate_proto_upbdefinit = {
   deps,
-  layouts,
+  &udpa_annotations_migrate_proto_upb_file_layout,
   "udpa/annotations/migrate.proto",
   UPB_STRVIEW_INIT(descriptor, 893)
 };

data/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c

@@ -8,15 +8,10 @@
 
 #include "upb/def.h"
 #include "udpa/annotations/security.upbdefs.h"
+#include "udpa/annotations/security.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-extern const upb_msglayout udpa_annotations_FieldSecurityAnnotation_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &udpa_annotations_FieldSecurityAnnotation_msginit,
-};
-
 static const char descriptor[453] = {'\n', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 
 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 
 's', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 
@@ -46,7 +41,7 @@ static upb_def_init *deps[3] = {
 
 upb_def_init udpa_annotations_security_proto_upbdefinit = {
   deps,
-  layouts,
+  &udpa_annotations_security_proto_upb_file_layout,
   "udpa/annotations/security.proto",
   UPB_STRVIEW_INIT(descriptor, 453)
 };

data/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c

@@ -8,9 +8,9 @@
 
 #include "upb/def.h"
 #include "udpa/annotations/sensitive.upbdefs.h"
+#include "udpa/annotations/sensitive.upb.h"
 
 extern upb_def_init google_protobuf_descriptor_proto_upbdefinit;
-
 static const char descriptor[196] = {'\n', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 
 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\020', 'u', 'd', 'p', 'a', '.', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 
 'n', 's', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 
@@ -28,7 +28,7 @@ static upb_def_init *deps[2] = {
 
 upb_def_init udpa_annotations_sensitive_proto_upbdefinit = {
   deps,
-  NULL,
+  &udpa_annotations_sensitive_proto_upb_file_layout,
   "udpa/annotations/sensitive.proto",
   UPB_STRVIEW_INIT(descriptor, 196)
 };