grpc 1.41.0 → 1.43.1

data/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c

@@ -8,18 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/service/route/v3/rds.upbdefs.h"
+#include "envoy/service/route/v3/rds.upb.h"
 
 extern upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit;
 extern upb_def_init google_api_annotations_proto_upbdefinit;
 extern upb_def_init envoy_annotations_resource_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_service_route_v3_RdsDummy_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_service_route_v3_RdsDummy_msginit,
-};
-
 static const char descriptor[1014] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 
 'r', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 
 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 
@@ -74,7 +69,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_service_route_v3_rds_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_service_route_v3_rds_proto_upb_file_layout,
   "envoy/service/route/v3/rds.proto",
   UPB_STRVIEW_INIT(descriptor, 1014)
 };

data/src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c

@@ -8,18 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/service/route/v3/srds.upbdefs.h"
+#include "envoy/service/route/v3/srds.upb.h"
 
 extern upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit;
 extern upb_def_init google_api_annotations_proto_upbdefinit;
 extern upb_def_init envoy_annotations_resource_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_service_route_v3_SrdsDummy_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_service_route_v3_SrdsDummy_msginit,
-};
-
 static const char descriptor[851] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 
 's', 'r', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', 
 '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 
@@ -68,7 +63,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_service_route_v3_srds_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_service_route_v3_srds_proto_upb_file_layout,
   "envoy/service/route/v3/srds.proto",
   UPB_STRVIEW_INIT(descriptor, 851)
 };

data/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c

@@ -8,6 +8,7 @@
 
 #include "upb/def.h"
 #include "envoy/service/status/v3/csds.upbdefs.h"
+#include "envoy/service/status/v3/csds.upb.h"
 
 extern upb_def_init envoy_admin_v3_config_dump_proto_upbdefinit;
 extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit;
@@ -18,20 +19,6 @@ extern upb_def_init google_protobuf_timestamp_proto_upbdefinit;
 extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_service_status_v3_ClientStatusRequest_msginit;
-extern const upb_msglayout envoy_service_status_v3_PerXdsConfig_msginit;
-extern const upb_msglayout envoy_service_status_v3_ClientConfig_msginit;
-extern const upb_msglayout envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit;
-extern const upb_msglayout envoy_service_status_v3_ClientStatusResponse_msginit;
-
-static const upb_msglayout *layouts[5] = {
-  &envoy_service_status_v3_ClientStatusRequest_msginit,
-  &envoy_service_status_v3_PerXdsConfig_msginit,
-  &envoy_service_status_v3_ClientConfig_msginit,
-  &envoy_service_status_v3_ClientConfig_GenericXdsConfig_msginit,
-  &envoy_service_status_v3_ClientStatusResponse_msginit,
-};
-
 static const char descriptor[2677] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 's', 't', 'a', 't', 'u', 's', '/', 'v', '3', 
 '/', 'c', 's', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 
 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 
@@ -157,7 +144,7 @@ static upb_def_init *deps[10] = {
 
 upb_def_init envoy_service_status_v3_csds_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_service_status_v3_csds_proto_upb_file_layout,
   "envoy/service/status/v3/csds.proto",
   UPB_STRVIEW_INIT(descriptor, 2677)
 };

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

@@ -8,21 +8,10 @@
 
 #include "upb/def.h"
 #include "envoy/type/http/v3/path_transformation.upbdefs.h"
+#include "envoy/type/http/v3/path_transformation.upb.h"
 
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init validate_validate_proto_upbdefinit;
-extern const upb_msglayout envoy_type_http_v3_PathTransformation_msginit;
-extern const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_msginit;
-extern const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit;
-extern const upb_msglayout envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit;
-
-static const upb_msglayout *layouts[4] = {
-  &envoy_type_http_v3_PathTransformation_msginit,
-  &envoy_type_http_v3_PathTransformation_Operation_msginit,
-  &envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986_msginit,
-  &envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_msginit,
-};
-
 static const char descriptor[618] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'h', 't', 't', 'p', '/', 'v', '3', '/', 'p', 'a', 't', 'h', 
 '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\022', 'e', 'n', 
 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 
@@ -58,7 +47,7 @@ static upb_def_init *deps[3] = {
 
 upb_def_init envoy_type_http_v3_path_transformation_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_http_v3_path_transformation_proto_upb_file_layout,
   "envoy/type/http/v3/path_transformation.proto",
   UPB_STRVIEW_INIT(descriptor, 618)
 };

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

@@ -8,19 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/metadata.upbdefs.h"
+#include "envoy/type/matcher/v3/metadata.upb.h"
 
 extern upb_def_init envoy_type_matcher_v3_value_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_MetadataMatcher_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_type_matcher_v3_MetadataMatcher_msginit,
-  &envoy_type_matcher_v3_MetadataMatcher_PathSegment_msginit,
-};
-
 static const char descriptor[645] = {'\n', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 
 'e', 't', 'a', 'd', 'a', 't', 'a', '.', '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', 
@@ -59,7 +52,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_metadata_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_metadata_proto_upb_file_layout,
   "envoy/type/matcher/v3/metadata.proto",
   UPB_STRVIEW_INIT(descriptor, 645)
 };

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

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/node.upbdefs.h"
+#include "envoy/type/matcher/v3/node.upb.h"
 
 extern upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit;
 extern upb_def_init envoy_type_matcher_v3_struct_proto_upbdefinit;
 extern upb_def_init udpa_annotations_status_proto_upbdefinit;
 extern upb_def_init udpa_annotations_versioning_proto_upbdefinit;
-extern const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_type_matcher_v3_NodeMatcher_msginit,
-};
-
 static const char descriptor[458] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'n', 
 'o', 'd', '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', 'h', 
@@ -50,7 +45,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_node_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_node_proto_upb_file_layout,
   "envoy/type/matcher/v3/node.proto",
   UPB_STRVIEW_INIT(descriptor, 458)
 };

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

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/number.upbdefs.h"
+#include "envoy/type/matcher/v3/number.upb.h"
 
 extern upb_def_init envoy_type_v3_range_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_DoubleMatcher_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_type_matcher_v3_DoubleMatcher_msginit,
-};
-
 static const char descriptor[404] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'n', 
 'u', 'm', 'b', 'e', 'r', '.', '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', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 
@@ -48,7 +43,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_number_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_number_proto_upb_file_layout,
   "envoy/type/matcher/v3/number.proto",
   UPB_STRVIEW_INIT(descriptor, 404)
 };

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

@@ -8,17 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/path.upbdefs.h"
+#include "envoy/type/matcher/v3/path.upb.h"
 
 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_PathMatcher_msginit;
-
-static const upb_msglayout *layouts[1] = {
-  &envoy_type_matcher_v3_PathMatcher_msginit,
-};
-
 static const char descriptor[390] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'p', 
 'a', 't', 'h', '.', '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', 'h', 
@@ -47,7 +42,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_path_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_path_proto_upb_file_layout,
   "envoy/type/matcher/v3/path.proto",
   UPB_STRVIEW_INIT(descriptor, 390)
 };

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

@@ -8,22 +8,13 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/regex.upbdefs.h"
+#include "envoy/type/matcher/v3/regex.upb.h"
 
 extern upb_def_init google_protobuf_wrappers_proto_upbdefinit;
 extern upb_def_init envoy_annotations_deprecation_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_RegexMatcher_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit;
-
-static const upb_msglayout *layouts[3] = {
-  &envoy_type_matcher_v3_RegexMatcher_msginit,
-  &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_msginit,
-  &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit,
-};
-
 static const char descriptor[822] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 
 'e', 'g', 'e', 'x', '.', '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', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
@@ -70,7 +61,7 @@ static upb_def_init *deps[6] = {
 
 upb_def_init envoy_type_matcher_v3_regex_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_regex_proto_upb_file_layout,
   "envoy/type/matcher/v3/regex.proto",
   UPB_STRVIEW_INIT(descriptor, 822)
 };

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

@@ -8,19 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/string.upbdefs.h"
+#include "envoy/type/matcher/v3/string.upb.h"
 
 extern upb_def_init envoy_type_matcher_v3_regex_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_StringMatcher_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_ListStringMatcher_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_type_matcher_v3_StringMatcher_msginit,
-  &envoy_type_matcher_v3_ListStringMatcher_msginit,
-};
-
 static const char descriptor[738] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
 't', 'r', 'i', 'n', 'g', '.', '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', 
@@ -63,7 +56,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_string_proto_upb_file_layout,
   "envoy/type/matcher/v3/string.proto",
   UPB_STRVIEW_INIT(descriptor, 738)
 };

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

@@ -8,19 +8,12 @@
 
 #include "upb/def.h"
 #include "envoy/type/matcher/v3/struct.upbdefs.h"
+#include "envoy/type/matcher/v3/struct.upb.h"
 
 extern upb_def_init envoy_type_matcher_v3_value_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_StructMatcher_msginit;
-extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_PathSegment_msginit;
-
-static const upb_msglayout *layouts[2] = {
-  &envoy_type_matcher_v3_StructMatcher_msginit,
-  &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit,
-};
-
 static const char descriptor[576] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 
 't', 'r', 'u', 'c', 't', '.', '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', 
@@ -57,7 +50,7 @@ static upb_def_init *deps[5] = {
 
 upb_def_init envoy_type_matcher_v3_struct_proto_upbdefinit = {
   deps,
-  layouts,
+  &envoy_type_matcher_v3_struct_proto_upb_file_layout,
   "envoy/type/matcher/v3/struct.proto",
   UPB_STRVIEW_INIT(descriptor, 576)
 };

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)
 };