Regenerate project

4 years ago · 0b04a92aba
parent 50f2fdd3cf
commit 0b04a92aba
14 changed files with 87 additions and 85 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -554,6 +554,10 @@ config("grpc_config") {
        "src/core/ext/upb-generated/udpa/annotations/status.upb.h",
        "src/core/ext/upb-generated/udpa/annotations/versioning.upb.c",
        "src/core/ext/upb-generated/udpa/annotations/versioning.upb.h",
+        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
+        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
+        "src/core/ext/upb-generated/validate/validate.upb.c",
+        "src/core/ext/upb-generated/validate/validate.upb.h",
        "src/core/ext/upb-generated/xds/core/v3/authority.upb.c",
        "src/core/ext/upb-generated/xds/core/v3/authority.upb.h",
        "src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c",
@ -566,10 +570,6 @@ config("grpc_config") {
        "src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h",
        "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c",
        "src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h",
-        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c",
-        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
-        "src/core/ext/upb-generated/validate/validate.upb.c",
-        "src/core/ext/upb-generated/validate/validate.upb.h",
        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c",
        "src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h",
        "src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c",
@ -712,6 +712,8 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h",
        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c",
        "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h",
+        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
+        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
        "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c",
        "src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h",
        "src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c",
@ -724,8 +726,6 @@ config("grpc_config") {
        "src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h",
        "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c",
        "src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h",
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c",
-        "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h",
        "src/core/ext/xds/certificate_provider_factory.h",
        "src/core/ext/xds/certificate_provider_registry.cc",
        "src/core/ext/xds/certificate_provider_registry.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1635,14 +1635,14 @@ add_library(grpc
  src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
  src/core/ext/upb-generated/udpa/annotations/status.upb.c
  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
+  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
+  src/core/ext/upb-generated/validate/validate.upb.c
  src/core/ext/upb-generated/xds/core/v3/authority.upb.c
  src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
  src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
  src/core/ext/upb-generated/xds/core/v3/resource.upb.c
  src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
  src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
-  src/core/ext/upb-generated/validate/validate.upb.c
  src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
  src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
@ -1714,13 +1714,13 @@ add_library(grpc
  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
+  src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
  src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
-  src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
  src/core/ext/xds/certificate_provider_registry.cc
  src/core/ext/xds/certificate_provider_store.cc
  src/core/ext/xds/file_watcher_certificate_provider_factory.cc
--- a/8
+++ b/8
@ -1218,14 +1218,14 @@ LIBGRPC_SRC = \
    src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
    src/core/ext/upb-generated/udpa/annotations/status.upb.c \
    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
+    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+    src/core/ext/upb-generated/validate/validate.upb.c \
    src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
    src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
    src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
    src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
@ -1297,13 +1297,13 @@ LIBGRPC_SRC = \
    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 \
+    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
    src/core/ext/xds/certificate_provider_registry.cc \
    src/core/ext/xds/certificate_provider_store.cc \
    src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@ -2807,13 +2807,13 @@ src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c: $(OPENSSL_DE
 src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c: $(OPENSSL_DEP)
+src/core/ext/upbdefs-generated/validate/validate.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c: $(OPENSSL_DEP)
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c: $(OPENSSL_DEP)
 src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP)
 src/core/ext/xds/certificate_provider_store.cc: $(OPENSSL_DEP)
 src/core/ext/xds/file_watcher_certificate_provider_factory.cc: $(OPENSSL_DEP)
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -546,14 +546,14 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
  - src/core/ext/upb-generated/udpa/annotations/status.upb.h
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
+  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
+  - src/core/ext/upb-generated/validate/validate.upb.h
  - src/core/ext/upb-generated/xds/core/v3/authority.upb.h
  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h
  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.h
  - src/core/ext/upb-generated/xds/core/v3/resource.upb.h
  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h
  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h
-  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
-  - src/core/ext/upb-generated/validate/validate.upb.h
  - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h
  - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h
@ -625,13 +625,13 @@ libs:
  - 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
+  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h
  - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h
-  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.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
@ -1052,14 +1052,14 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
  - src/core/ext/upb-generated/udpa/annotations/status.upb.c
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
+  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
+  - src/core/ext/upb-generated/validate/validate.upb.c
  - src/core/ext/upb-generated/xds/core/v3/authority.upb.c
  - src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c
  - src/core/ext/upb-generated/xds/core/v3/context_params.upb.c
  - src/core/ext/upb-generated/xds/core/v3/resource.upb.c
  - src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c
  - src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c
-  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
-  - src/core/ext/upb-generated/validate/validate.upb.c
  - src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c
  - src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c
@ -1131,13 +1131,13 @@ libs:
  - 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
+  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c
  - src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c
-  - src/core/ext/upbdefs-generated/validate/validate.upbdefs.c
  - src/core/ext/xds/certificate_provider_registry.cc
  - src/core/ext/xds/certificate_provider_store.cc
  - src/core/ext/xds/file_watcher_certificate_provider_factory.cc
--- a/config.m4
+++ b/config.m4
@ -224,14 +224,14 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
    src/core/ext/upb-generated/udpa/annotations/status.upb.c \
    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
+    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+    src/core/ext/upb-generated/validate/validate.upb.c \
    src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
    src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
    src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
    src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
    src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
    src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
@ -304,13 +304,13 @@ if test "$PHP_GRPC" != "no"; then
    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 \
+    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
    src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
    src/core/ext/xds/certificate_provider_registry.cc \
    src/core/ext/xds/certificate_provider_store.cc \
    src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@ -1072,9 +1072,9 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/health/v1)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lb/v1)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/core/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/data/orca/v1)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/core/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/annotations)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/cluster/v3)
@ -1100,8 +1100,8 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/protobuf)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/rpc)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/core/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/core/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/avl)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
--- a/config.w32
+++ b/config.w32
@ -191,14 +191,14 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upb-generated\\udpa\\annotations\\sensitive.upb.c " +
    "src\\core\\ext\\upb-generated\\udpa\\annotations\\status.upb.c " +
    "src\\core\\ext\\upb-generated\\udpa\\annotations\\versioning.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\authority.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\collection_entry.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\context_params.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\resource.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\resource_locator.upb.c " +
-    "src\\core\\ext\\upb-generated\\udpa\\core\\v1\\resource_name.upb.c " +
    "src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1\\orca_load_report.upb.c " +
    "src\\core\\ext\\upb-generated\\validate\\validate.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\authority.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\collection_entry.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\context_params.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource_locator.upb.c " +
+    "src\\core\\ext\\upb-generated\\xds\\core\\v3\\resource_name.upb.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\deprecation.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\annotations\\resource.upbdefs.c " +
    "src\\core\\ext\\upbdefs-generated\\envoy\\config\\accesslog\\v3\\accesslog.upbdefs.c " +
@ -271,13 +271,13 @@ if (PHP_GRPC != "no") {
    "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 " +
-    "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 " +
    "src\\core\\ext\\upbdefs-generated\\validate\\validate.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\authority.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\collection_entry.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\context_params.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource_locator.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-generated\\xds\\core\\v3\\resource_name.upbdefs.c " +
    "src\\core\\ext\\xds\\certificate_provider_registry.cc " +
    "src\\core\\ext\\xds\\certificate_provider_store.cc " +
    "src\\core\\ext\\xds\\file_watcher_certificate_provider_factory.cc " +
@ -1113,12 +1113,13 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\src\\proto\\grpc\\lb\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\core\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\validate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\xds\\core\\v3");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\envoy\\annotations");
@ -1175,9 +1176,10 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\google\\rpc");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\annotations");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\udpa\\core\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\validate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\core");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-generated\\xds\\core\\v3");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\avl");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -362,14 +362,14 @@ Pod::Spec.new do |s|
                      'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
                      'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
+                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
+                      'src/core/ext/upb-generated/validate/validate.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
-                      'src/core/ext/upb-generated/validate/validate.upb.h',
                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
@ -442,13 +442,13 @@ Pod::Spec.new do |s|
                      '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',
+                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.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',
@ -983,14 +983,14 @@ Pod::Spec.new do |s|
                              'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
                              'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
+                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
+                              'src/core/ext/upb-generated/validate/validate.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
-                              'src/core/ext/upb-generated/validate/validate.upb.h',
                              'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
@ -1063,13 +1063,13 @@ Pod::Spec.new do |s|
                              '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',
+                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.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',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -536,6 +536,10 @@ Pod::Spec.new do |s|
                      'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
+                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
+                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
+                      'src/core/ext/upb-generated/validate/validate.upb.c',
+                      'src/core/ext/upb-generated/validate/validate.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
                      'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
@ -548,10 +552,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
                      'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
-                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
-                      'src/core/ext/upb-generated/validate/validate.upb.c',
-                      'src/core/ext/upb-generated/validate/validate.upb.h',
                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
                      'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
                      'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
@ -696,6 +696,8 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h',
                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
                      'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h',
+                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
+                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
                      'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
@ -708,8 +710,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
                      'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
-                      'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                      'src/core/ext/xds/certificate_provider_factory.h',
                      'src/core/ext/xds/certificate_provider_registry.cc',
                      'src/core/ext/xds/certificate_provider_registry.h',
@ -1519,14 +1519,14 @@ Pod::Spec.new do |s|
                              'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h',
                              'src/core/ext/upb-generated/udpa/annotations/status.upb.h',
                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
+                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
+                              'src/core/ext/upb-generated/validate/validate.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/authority.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/context_params.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
                              'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
-                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
-                              'src/core/ext/upb-generated/validate/validate.upb.h',
                              'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
                              'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
@ -1599,13 +1599,13 @@ Pod::Spec.new do |s|
                              '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',
+                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h',
                              'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h',
-                              'src/core/ext/upbdefs-generated/validate/validate.upbdefs.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',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -451,6 +451,10 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upb-generated/udpa/annotations/status.upb.h )
  s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.c )
  s.files += %w( src/core/ext/upb-generated/udpa/annotations/versioning.upb.h )
+  s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c )
+  s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h )
+  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c )
+  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.h )
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.c )
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/authority.upb.h )
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c )
@ -463,10 +467,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h )
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c )
  s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h )
-  s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c )
-  s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h )
-  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c )
-  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c )
@ -611,6 +611,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c )
@ -623,8 +625,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h )
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c )
  s.files += %w( src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h )
-  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.c )
-  s.files += %w( src/core/ext/upbdefs-generated/validate/validate.upbdefs.h )
  s.files += %w( src/core/ext/xds/certificate_provider_factory.h )
  s.files += %w( src/core/ext/xds/certificate_provider_registry.cc )
  s.files += %w( src/core/ext/xds/certificate_provider_registry.h )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -637,14 +637,14 @@
        'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
        'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
        'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
+        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
+        'src/core/ext/upb-generated/validate/validate.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
        'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
        'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
        'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
@ -716,13 +716,13 @@
        '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',
+        'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
        'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-        'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
        'src/core/ext/xds/certificate_provider_registry.cc',
        'src/core/ext/xds/certificate_provider_store.cc',
        'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
--- a/package.xml
+++ b/package.xml
@ -431,6 +431,10 @@
    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/status.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/versioning.upb.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/annotations/versioning.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/authority.upb.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/authority.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c" role="src" />
@ -443,10 +447,6 @@
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c" role="src" />
@ -591,6 +591,8 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c" role="src" />
@ -603,8 +605,6 @@
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/upbdefs-generated/validate/validate.upbdefs.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_registry.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_registry.h" role="src" />
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -200,14 +200,14 @@ CORE_SOURCE_FILES = [
    'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
    'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
    'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
+    'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
+    'src/core/ext/upb-generated/validate/validate.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
    'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-    'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
-    'src/core/ext/upb-generated/validate/validate.upb.c',
    'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
    'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
@ -280,13 +280,13 @@ CORE_SOURCE_FILES = [
    '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',
+    'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
    'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-    'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
    'src/core/ext/xds/certificate_provider_registry.cc',
    'src/core/ext/xds/certificate_provider_store.cc',
    'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1384,6 +1384,10 @@ src/core/ext/upb-generated/udpa/annotations/status.upb.c \
 src/core/ext/upb-generated/udpa/annotations/status.upb.h \
 src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
 src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
+src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
+src/core/ext/upb-generated/validate/validate.upb.c \
+src/core/ext/upb-generated/validate/validate.upb.h \
 src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
 src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
 src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
@ -1396,10 +1400,6 @@ src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
 src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
 src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
 src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
-src/core/ext/upb-generated/validate/validate.upb.c \
-src/core/ext/upb-generated/validate/validate.upb.h \
 src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
@ -1542,6 +1542,8 @@ src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
+src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
+src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
@ -1554,8 +1556,6 @@ src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/xds/certificate_provider_factory.h \
 src/core/ext/xds/certificate_provider_registry.cc \
 src/core/ext/xds/certificate_provider_registry.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1220,6 +1220,10 @@ src/core/ext/upb-generated/udpa/annotations/status.upb.c \
 src/core/ext/upb-generated/udpa/annotations/status.upb.h \
 src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
 src/core/ext/upb-generated/udpa/annotations/versioning.upb.h \
+src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
+src/core/ext/upb-generated/validate/validate.upb.c \
+src/core/ext/upb-generated/validate/validate.upb.h \
 src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
 src/core/ext/upb-generated/xds/core/v3/authority.upb.h \
 src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
@ -1232,10 +1236,6 @@ src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
 src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h \
 src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
 src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
-src/core/ext/upb-generated/validate/validate.upb.c \
-src/core/ext/upb-generated/validate/validate.upb.h \
 src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
 src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h \
 src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
@ -1378,6 +1378,8 @@ src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h \
 src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
 src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h \
+src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
+src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
@ -1390,8 +1392,6 @@ src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
 src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-src/core/ext/upbdefs-generated/validate/validate.upbdefs.h \
 src/core/ext/xds/certificate_provider_factory.h \
 src/core/ext/xds/certificate_provider_registry.cc \
 src/core/ext/xds/certificate_provider_registry.h \