Imported Upstream version 1.33.1
[platform/upstream/grpc.git] / BUILD
diff --git a/BUILD b/BUILD
index b9e9a22..16e76a4 100644 (file)
--- a/BUILD
+++ b/BUILD
@@ -80,11 +80,11 @@ config_setting(
 python_config_settings()
 
 # This should be updated along with build_handwritten.yaml
-g_stands_for = "gauntlet"
+g_stands_for = "geeky"
 
 core_version = "13.0.0"
 
-version = "1.34.0-dev"
+version = "1.33.1"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -323,7 +323,7 @@ grpc_cc_library(
         "//conditions:default": [
             "grpc_lb_policy_cds",
             "grpc_lb_policy_eds",
-            "grpc_lb_policy_xds_cluster_impl",
+            "grpc_lb_policy_eds_drop",
             "grpc_lb_policy_xds_cluster_manager",
             "grpc_resolver_xds",
             "grpc_xds_credentials",
@@ -529,7 +529,6 @@ grpc_cc_library(
         "src/core/lib/gpr/tls_gcc.h",
         "src/core/lib/gpr/tls_msvc.h",
         "src/core/lib/gpr/tls_pthread.h",
-        "src/core/lib/gpr/tls_stdcpp.h",
         "src/core/lib/gpr/tmpfile.h",
         "src/core/lib/gpr/useful.h",
         "src/core/lib/gprpp/arena.h",
@@ -1306,19 +1305,19 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "grpc_xds_credentials",
-    srcs = [
-        "src/core/ext/xds/certificate_provider_registry.cc",
-        "src/core/lib/security/credentials/xds/xds_credentials.cc",
-    ],
+    name = "grpc_xds_api_header",
     hdrs = [
-        "src/core/ext/xds/certificate_provider_factory.h",
-        "src/core/ext/xds/certificate_provider_registry.h",
-        "src/core/ext/xds/certificate_provider_store.h",
-        "src/core/lib/security/credentials/xds/xds_credentials.h",
+        "src/core/ext/xds/xds_api.h",
+        "src/core/ext/xds/xds_bootstrap.h",
+        "src/core/ext/xds/xds_client_stats.h",
+    ],
+    external_deps = [
+        "upb_lib",
+        "re2",
     ],
+    language = "c++",
     deps = [
-        "grpc_secure",
+        "grpc_base",
     ],
 )
 
@@ -1331,25 +1330,17 @@ grpc_cc_library(
         "src/core/ext/xds/xds_client_stats.cc",
     ],
     hdrs = [
-        "src/core/ext/xds/xds_api.h",
-        "src/core/ext/xds/xds_bootstrap.h",
         "src/core/ext/xds/xds_channel_args.h",
         "src/core/ext/xds/xds_client.h",
-        "src/core/ext/xds/xds_client_stats.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_textformat_lib",
-        "re2",
     ],
     language = "c++",
     deps = [
         "envoy_ads_upb",
-        "envoy_ads_upbdefs",
         "grpc_base",
         "grpc_client_channel",
         "grpc_google_mesh_ca_certificate_provider_factory",
-        "grpc_xds_credentials",
+        "grpc_secure",
+        "grpc_xds_api_header",
     ],
 )
 
@@ -1364,7 +1355,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "grpc_base",
-        "grpc_xds_credentials",
+        "grpc_secure",
     ],
 )
 
@@ -1382,23 +1373,13 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "grpc_lb_xds_common",
-    hdrs = [
-        "src/core/ext/filters/client_channel/lb_policy/xds/xds.h",
-    ],
-    language = "c++",
-    deps = [
-        "grpc_base",
-        "grpc_client_channel",
-        "grpc_xds_client",
-    ],
-)
-
-grpc_cc_library(
     name = "grpc_lb_policy_eds",
     srcs = [
         "src/core/ext/filters/client_channel/lb_policy/xds/eds.cc",
     ],
+    hdrs = [
+        "src/core/ext/filters/client_channel/lb_policy/xds/xds.h",
+    ],
     external_deps = [
         "absl/strings",
     ],
@@ -1407,15 +1388,14 @@ grpc_cc_library(
         "grpc_base",
         "grpc_client_channel",
         "grpc_lb_address_filtering",
-        "grpc_lb_xds_common",
         "grpc_xds_client",
     ],
 )
 
 grpc_cc_library(
-    name = "grpc_lb_policy_xds_cluster_impl",
+    name = "grpc_lb_policy_eds_drop",
     srcs = [
-        "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc",
+        "src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc",
     ],
     external_deps = [
         "absl/strings",
@@ -1424,7 +1404,6 @@ grpc_cc_library(
     deps = [
         "grpc_base",
         "grpc_client_channel",
-        "grpc_lb_xds_common",
         "grpc_xds_client",
     ],
 )
@@ -1442,6 +1421,7 @@ grpc_cc_library(
         "grpc_base",
         "grpc_client_channel",
         "grpc_resolver_xds_header",
+        "grpc_xds_api_header",
     ],
 )
 
@@ -1753,18 +1733,17 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_secure",
     srcs = [
+        "src/core/ext/xds/certificate_provider_registry.cc",
         "src/core/lib/http/httpcli_security_connector.cc",
         "src/core/lib/security/context/security_context.cc",
         "src/core/lib/security/credentials/alts/alts_credentials.cc",
         "src/core/lib/security/credentials/composite/composite_credentials.cc",
         "src/core/lib/security/credentials/credentials.cc",
         "src/core/lib/security/credentials/credentials_metadata.cc",
-        "src/core/lib/security/credentials/external/external_account_credentials.cc",
         "src/core/lib/security/credentials/fake/fake_credentials.cc",
         "src/core/lib/security/credentials/google_default/credentials_generic.cc",
         "src/core/lib/security/credentials/google_default/google_default_credentials.cc",
         "src/core/lib/security/credentials/iam/iam_credentials.cc",
-        "src/core/lib/security/credentials/insecure/insecure_credentials.cc",
         "src/core/lib/security/credentials/jwt/json_token.cc",
         "src/core/lib/security/credentials/jwt/jwt_credentials.cc",
         "src/core/lib/security/credentials/jwt/jwt_verifier.cc",
@@ -1777,7 +1756,6 @@ grpc_cc_library(
         "src/core/lib/security/credentials/tls/tls_credentials.cc",
         "src/core/lib/security/security_connector/alts/alts_security_connector.cc",
         "src/core/lib/security/security_connector/fake/fake_security_connector.cc",
-        "src/core/lib/security/security_connector/insecure/insecure_security_connector.cc",
         "src/core/lib/security/security_connector/load_system_roots_fallback.cc",
         "src/core/lib/security/security_connector/load_system_roots_linux.cc",
         "src/core/lib/security/security_connector/local/local_security_connector.cc",
@@ -1796,13 +1774,15 @@ grpc_cc_library(
     ],
     hdrs = [
         "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h",
+        "src/core/ext/xds/certificate_provider_factory.h",
+        "src/core/ext/xds/certificate_provider_registry.h",
+        "src/core/ext/xds/certificate_provider_store.h",
         "src/core/ext/xds/xds_channel_args.h",
         "src/core/lib/security/certificate_provider.h",
         "src/core/lib/security/context/security_context.h",
         "src/core/lib/security/credentials/alts/alts_credentials.h",
         "src/core/lib/security/credentials/composite/composite_credentials.h",
         "src/core/lib/security/credentials/credentials.h",
-        "src/core/lib/security/credentials/external/external_account_credentials.h",
         "src/core/lib/security/credentials/fake/fake_credentials.h",
         "src/core/lib/security/credentials/google_default/google_default_credentials.h",
         "src/core/lib/security/credentials/iam/iam_credentials.h",
@@ -1818,7 +1798,6 @@ grpc_cc_library(
         "src/core/lib/security/credentials/tls/tls_credentials.h",
         "src/core/lib/security/security_connector/alts/alts_security_connector.h",
         "src/core/lib/security/security_connector/fake/fake_security_connector.h",
-        "src/core/lib/security/security_connector/insecure/insecure_security_connector.h",
         "src/core/lib/security/security_connector/load_system_roots.h",
         "src/core/lib/security/security_connector/load_system_roots_linux.h",
         "src/core/lib/security/security_connector/local/local_security_connector.h",
@@ -1844,15 +1823,28 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
+    name = "grpc_xds_credentials",
+    srcs = [
+        "src/core/lib/security/credentials/xds/xds_credentials.cc",
+    ],
+    hdrs = [
+        "src/core/lib/security/credentials/xds/xds_credentials.h",
+    ],
+    deps = [
+        "grpc_secure",
+    ],
+)
+
+grpc_cc_library(
     name = "grpc_mock_cel",
     hdrs = [
         "src/core/lib/security/authorization/mock_cel/activation.h",
-        #"src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h",
-        #"src/core/lib/security/authorization/mock_cel/cel_expression.h",
+        "src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h",
+        "src/core/lib/security/authorization/mock_cel/cel_expression.h",
         "src/core/lib/security/authorization/mock_cel/cel_value.h",
-        #"src/core/lib/security/authorization/mock_cel/evaluator_core.h",
-        #"src/core/lib/security/authorization/mock_cel/flat_expr_builder.h",
-        #"src/core/lib/security/authorization/mock_cel/statusor.h",
+        "src/core/lib/security/authorization/mock_cel/evaluator_core.h",
+        "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h",
+        "src/core/lib/security/authorization/mock_cel/statusor.h",
     ],
     language = "c++",
     deps = [
@@ -2376,6 +2368,7 @@ grpc_cc_library(
     language = "c++",
     public_hdrs = [
         "include/grpcpp/ext/channelz_service_plugin.h",
+        "include/grpcpp/ext/channelz_service_plugin_impl.h",
     ],
     deps = [
         ":grpc++",
@@ -2579,7 +2572,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2594,88 +2586,6 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "envoy_ads_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/cluster/v3/cds.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":envoy_ads_upb",
-        ":envoy_annotations_upbdefs",
-        ":envoy_core_upbdefs",
-        ":envoy_type_upbdefs",
-        ":google_api_upbdefs",
-        ":proto_gen_validate_upbdefs",
-        ":udpa_annotations_upbdefs",
-        ":udpa_core_upbdefs",
-    ],
-)
-
-grpc_cc_library(
     name = "envoy_annotations_upb",
     srcs = [
         "src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c",
@@ -2687,7 +2597,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2696,28 +2605,6 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "envoy_annotations_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":envoy_annotations_upb",
-        ":google_api_upbdefs",
-    ],
-)
-
-grpc_cc_library(
     name = "envoy_core_upb",
     srcs = [
         "src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c",
@@ -2751,7 +2638,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2765,52 +2651,6 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "envoy_core_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":envoy_core_upb",
-        ":envoy_type_upbdefs",
-        ":google_api_upbdefs",
-        ":proto_gen_validate_upbdefs",
-    ],
-)
-
-grpc_cc_library(
     name = "envoy_type_upb",
     srcs = [
         "src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c",
@@ -2842,7 +2682,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2854,49 +2693,6 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "envoy_type_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.h",
-        "src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":envoy_type_upb",
-        ":google_api_upbdefs",
-        ":proto_gen_validate_upbdefs",
-    ],
-)
-
-grpc_cc_library(
     name = "proto_gen_validate_upb",
     srcs = [
         "src/core/ext/upb-generated/validate/validate.upb.c",
@@ -2906,7 +2702,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2914,26 +2709,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "proto_gen_validate_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":google_api_upbdefs",
-        ":proto_gen_validate_upb",
-    ],
-)
-
 # Once upb code-gen issue is resolved, replace udpa_orca_upb with this.
 # grpc_upb_proto_library(
 #     name = "udpa_orca_upb",
@@ -2950,7 +2725,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2976,7 +2750,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -2986,34 +2759,6 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "udpa_annotations_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":google_api_upbdefs",
-        ":udpa_annotations_upb",
-    ],
-)
-
-grpc_cc_library(
     name = "udpa_core_upb",
     srcs = [
         "src/core/ext/upb-generated/udpa/core/v1/authority.upb.c",
@@ -3033,7 +2778,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -3043,38 +2787,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "udpa_core_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h",
-        "src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":google_api_upbdefs",
-        ":proto_gen_validate_upbdefs",
-        ":udpa_annotations_upbdefs",
-        ":udpa_core_upb",
-    ],
-)
-
 # Once upb code-gen issue is resolved, replace grpc_health_upb with this.
 # grpc_upb_proto_library(
 #     name = "grpc_health_upb",
@@ -3091,7 +2803,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
 )
@@ -3105,6 +2816,7 @@ grpc_cc_library(
         "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c",
         "src/core/ext/upb-generated/google/api/http.upb.c",
         "src/core/ext/upb-generated/google/protobuf/any.upb.c",
+        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c",
         "src/core/ext/upb-generated/google/protobuf/duration.upb.c",
         "src/core/ext/upb-generated/google/protobuf/empty.upb.c",
         "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
@@ -3118,6 +2830,7 @@ grpc_cc_library(
         "src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h",
         "src/core/ext/upb-generated/google/api/http.upb.h",
         "src/core/ext/upb-generated/google/protobuf/any.upb.h",
+        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h",
         "src/core/ext/upb-generated/google/protobuf/duration.upb.h",
         "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
         "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
@@ -3127,48 +2840,10 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
 )
 
-grpc_cc_library(
-    name = "google_api_upbdefs",
-    srcs = [
-        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/api/http.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c",
-        "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c",
-    ],
-    hdrs = [
-        "src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/api/http.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.h",
-        "src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.h",
-    ],
-    external_deps = [
-        "upb_lib",
-        "upb_lib_descriptor",
-        "upb_textformat_lib",
-    ],
-    language = "c++",
-    deps = [
-        ":google_api_upb",
-    ],
-)
-
 # Once upb code-gen issue is resolved, replace grpc_lb_upb with this.
 # grpc_upb_proto_library(
 #     name = "grpc_lb_upb",
@@ -3185,7 +2860,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
     deps = [
@@ -3233,7 +2907,6 @@ grpc_cc_library(
     ],
     external_deps = [
         "upb_lib",
-        "upb_lib_descriptor",
     ],
     language = "c++",
 )