Added google/protobuf/descriptor.upb.* to google_api_upb

2019-08-07 11:59:36 -07:00 · 2019-08-07 11:59:36 -07:00 · 6ddfb384c1
parent ff74b63157
commit 6ddfb384c1
26 changed files with 2185 additions and 57 deletions
--- a/2
+++ b/2
@ -2329,6 +2329,7 @@ grpc_cc_library(
    srcs = [
        "src/core/ext/upb-generated/google/protobuf/any.upb.c",
        "src/core/ext/upb-generated/google/protobuf/duration.upb.c",
+        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c",
        "src/core/ext/upb-generated/google/protobuf/empty.upb.c",
        "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c",
@ -2337,6 +2338,7 @@ grpc_cc_library(
    hdrs = [
        "src/core/ext/upb-generated/google/protobuf/any.upb.h",
        "src/core/ext/upb-generated/google/protobuf/duration.upb.h",
+        "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h",
        "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
        "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h",
--- a/BUILD.gn
+++ b/BUILD.gn
@ -857,7 +857,6 @@ config("grpc_config") {
        "src/core/tsi/transport_security_grpc.cc",
        "src/core/tsi/transport_security_grpc.h",
        "src/core/tsi/transport_security_interface.h",
-        "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c",
        "third_party/upb/upb/decode.c",
        "third_party/upb/upb/encode.c",
        "third_party/upb/upb/msg.c",
@ -1382,7 +1381,6 @@ config("grpc_config") {
        "src/cpp/util/status.cc",
        "src/cpp/util/string_ref.cc",
        "src/cpp/util/time_cc.cc",
-        "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c",
        "third_party/upb/upb/decode.c",
        "third_party/upb/upb/encode.c",
        "third_party/upb/upb/msg.c",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1266,7 +1266,6 @@ add_library(grpc
  third_party/nanopb/pb_decode.c
  third_party/nanopb/pb_encode.c
  src/core/tsi/transport_security.cc
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -1678,7 +1677,6 @@ add_library(grpc_cronet
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -2077,7 +2075,6 @@ add_library(grpc_test_util
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -2419,7 +2416,6 @@ add_library(grpc_test_util_unsecure
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -2772,7 +2768,6 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -3173,7 +3168,6 @@ add_library(grpc++
  src/cpp/util/string_ref.cc
  src/cpp/util/time_cc.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
@ -4283,7 +4277,6 @@ add_library(grpc++_unsecure
  src/cpp/util/string_ref.cc
  src/cpp/util/time_cc.cc
  src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
-  third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c
  third_party/upb/upb/decode.c
  third_party/upb/upb/encode.c
  third_party/upb/upb/msg.c
--- a/9
+++ b/9
@ -348,7 +348,7 @@ CXXFLAGS += -stdlib=libc++
 LDFLAGS += -framework CoreFoundation
 endif
 CXXFLAGS += -Wnon-virtual-dtor
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-long-long -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers -Wno-maybe-uninitialized -DPB_FIELD_32BIT -DOSATOMIC_USE_INLINED=1 -Ithird_party/nanopb -Ithird_party/upb -Ithird_party/upb/generated_for_cmake -Isrc/core/ext/upb-generated
+CPPFLAGS += -g -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-long-long -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers -Wno-maybe-uninitialized -DPB_FIELD_32BIT -DOSATOMIC_USE_INLINED=1 -Ithird_party/nanopb -Ithird_party/upb -Isrc/core/ext/upb-generated
 COREFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += -g

@ -3757,7 +3757,6 @@ LIBGRPC_SRC = \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
    src/core/tsi/transport_security.cc \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -4157,7 +4156,6 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -4543,7 +4541,6 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -4866,7 +4863,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -5187,7 +5183,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -5534,7 +5529,6 @@ LIBGRPC++_SRC = \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time_cc.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -6566,7 +6560,6 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time_cc.cc \
    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
--- a/build.yaml
+++ b/build.yaml
@ -125,6 +125,7 @@ filegroups:
 - name: google_api_upb
  headers:
  - 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
@ -132,6 +133,7 @@ filegroups:
  - src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
  src:
  - 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
@ -6197,7 +6199,7 @@ defaults:
      -Wno-unused-parameter -Wno-deprecated-declarations -Wno-sign-conversion -Wno-shadow
      -Wno-conversion -Wno-implicit-fallthrough -Wno-sign-compare -Wno-missing-field-initializers
      -Wno-maybe-uninitialized -DPB_FIELD_32BIT -DOSATOMIC_USE_INLINED=1 -Ithird_party/nanopb
-      -Ithird_party/upb -Ithird_party/upb/generated_for_cmake -Isrc/core/ext/upb-generated
+      -Ithird_party/upb -Isrc/core/ext/upb-generated
    CXXFLAGS: -Wnon-virtual-dtor
    LDFLAGS: -g
  zlib:
--- a/cmake/upb.cmake
+++ b/cmake/upb.cmake
@ -15,5 +15,4 @@
 set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)

 set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
-set(_gRPC_UPB_GENERATED_DIR "${UPB_ROOT_DIR}/generated_for_cmake")
 set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
--- a/config.m4
+++ b/config.m4
@ -12,7 +12,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/boringssl/include)
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/nanopb)
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/upb)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/upb/generated_for_cmake)

  LIBS="-lpthread $LIBS"

@ -346,7 +345,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
    src/core/tsi/transport_security.cc \
-    third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
    third_party/upb/upb/decode.c \
    third_party/upb/upb/encode.c \
    third_party/upb/upb/msg.c \
@ -816,6 +814,5 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/ssl)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/third_party/fiat)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/nanopb)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/generated_for_cmake/google/protobuf)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb)
 fi
--- a/config.w32
+++ b/config.w32
@ -318,7 +318,6 @@ if (PHP_GRPC != "no") {
    "third_party\\nanopb\\pb_decode.c " +
    "third_party\\nanopb\\pb_encode.c " +
    "src\\core\\tsi\\transport_security.cc " +
-    "third_party\\upb\\generated_for_cmake\\google\\protobuf\\descriptor.upb.c " +
    "third_party\\upb\\upb\\decode.c " +
    "third_party\\upb\\upb\\encode.c " +
    "third_party\\upb\\upb\\msg.c " +
@ -692,7 +691,6 @@ if (PHP_GRPC != "no") {
    "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
    "/I"+configure_module_dirname+"\\third_party\\nanopb "+
    "/I"+configure_module_dirname+"\\third_party\\upb "+
-    "/I"+configure_module_dirname+"\\third_party\\upb\\generated_for_cmake "+
    "/I"+configure_module_dirname+"\\third_party\\zlib ");

  base_dir = get_define('BUILD_DIR');
@ -844,9 +842,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl\\third_party\\fiat");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\nanopb");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\generated_for_cmake");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\generated_for_cmake\\google");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\generated_for_cmake\\google\\protobuf");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\zlib");
  _build_dirs = new Array();
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -805,7 +805,5 @@ Pod::Spec.new do |s|
    find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
    find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
    find src/core/ src/cpp/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
-    find third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "third_party/upb/generated_for_cmake/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
-    find third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
  END_OF_COMMAND
 end
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -805,7 +805,6 @@ Pod::Spec.new do |s|
                      'src/core/tsi/alts/handshaker/handshaker.pb.c',
                      'src/core/tsi/alts/handshaker/transport_security_common.pb.c',
                      'src/core/tsi/transport_security.cc',
-                      'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
                      'third_party/upb/upb/decode.c',
                      'third_party/upb/upb/encode.c',
                      'third_party/upb/upb/msg.c',
@ -1402,7 +1401,5 @@ Pod::Spec.new do |s|
    find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
    find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
    find src/core/ src/cpp/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
-    find third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "third_party/upb/generated_for_cmake/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
-    find third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
  END_OF_COMMAND
 end
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -742,7 +742,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/nanopb/pb_decode.c )
  s.files += %w( third_party/nanopb/pb_encode.c )
  s.files += %w( src/core/tsi/transport_security.cc )
-  s.files += %w( third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c )
  s.files += %w( third_party/upb/upb/decode.c )
  s.files += %w( third_party/upb/upb/encode.c )
  s.files += %w( third_party/upb/upb/msg.c )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -70,7 +70,6 @@
      '-DOSATOMIC_USE_INLINED=1',
      '-Ithird_party/nanopb',
      '-Ithird_party/upb',
-      '-Ithird_party/upb/generated_for_cmake',
      '-Isrc/core/ext/upb-generated',
    ],
    'ldflags': [
@ -162,7 +161,6 @@
            '-DOSATOMIC_USE_INLINED=1',
            '-Ithird_party/nanopb',
            '-Ithird_party/upb',
-            '-Ithird_party/upb/generated_for_cmake',
            '-Isrc/core/ext/upb-generated',
          ],
          'OTHER_CPLUSPLUSFLAGS': [
@ -185,7 +183,6 @@
            '-DOSATOMIC_USE_INLINED=1',
            '-Ithird_party/nanopb',
            '-Ithird_party/upb',
-            '-Ithird_party/upb/generated_for_cmake',
            '-Isrc/core/ext/upb-generated',
            '-stdlib=libc++',
            '-std=c++11',
@ -558,7 +555,6 @@
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
        'src/core/tsi/transport_security.cc',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
@ -872,7 +868,6 @@
        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
@ -1128,7 +1123,6 @@
        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
@ -1395,7 +1389,6 @@
        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
@ -1549,7 +1542,6 @@
        'src/cpp/util/string_ref.cc',
        'src/cpp/util/time_cc.cc',
        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
@ -1710,7 +1702,6 @@
        'src/cpp/util/string_ref.cc',
        'src/cpp/util/time_cc.cc',
        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
        'third_party/upb/upb/decode.c',
        'third_party/upb/upb/encode.c',
        'third_party/upb/upb/msg.c',
--- a/package.xml
+++ b/package.xml
@ -747,7 +747,6 @@
    <file baseinstalldir="/" name="third_party/nanopb/pb_decode.c" role="src" />
    <file baseinstalldir="/" name="third_party/nanopb/pb_encode.c" role="src" />
    <file baseinstalldir="/" name="src/core/tsi/transport_security.cc" role="src" />
-    <file baseinstalldir="/" name="third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c" role="src" />
    <file baseinstalldir="/" name="third_party/upb/upb/decode.c" role="src" />
    <file baseinstalldir="/" name="third_party/upb/upb/encode.c" role="src" />
    <file baseinstalldir="/" name="third_party/upb/upb/msg.c" role="src" />
--- a/setup.py
+++ b/setup.py
@ -50,7 +50,6 @@ if 'openbsd' in sys.platform:
 NANOPB_INCLUDE = (os.path.join('third_party', 'nanopb'),)
 SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
 UPB_INCLUDE = (os.path.join('third_party', 'upb'),)
-UPB_GENERATED_INCLUDE = (os.path.join('third_party','upb', 'generated_for_cmake'),)
 UPB_GRPC_GENERATED_INCLUDE = (os.path.join('src', 'core', 'ext', 'upb-generated'),)
 ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
 README = os.path.join(PYTHON_STEM, 'README.rst')
@ -213,7 +212,6 @@ EXTENSION_INCLUDE_DIRECTORIES = (
    NANOPB_INCLUDE +
    SSL_INCLUDE +
    UPB_INCLUDE +
-    UPB_GENERATED_INCLUDE +
    UPB_GRPC_GENERATED_INCLUDE +
    ZLIB_INCLUDE)

--- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
+++ b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
@ -0,0 +1,485 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     google/protobuf/descriptor.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include <stddef.h>
+#include "upb/msg.h"
+#include "google/protobuf/descriptor.upb.h"
+
+#include "upb/port_def.inc"
+
+static const upb_msglayout *const google_protobuf_FileDescriptorSet_submsgs[1] = {
+  &google_protobuf_FileDescriptorProto_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_FileDescriptorSet__fields[1] = {
+  {1, UPB_SIZE(0, 0), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_FileDescriptorSet_msginit = {
+  &google_protobuf_FileDescriptorSet_submsgs[0],
+  &google_protobuf_FileDescriptorSet__fields[0],
+  UPB_SIZE(4, 8), 1, false,
+};
+
+static const upb_msglayout *const google_protobuf_FileDescriptorProto_submsgs[6] = {
+  &google_protobuf_DescriptorProto_msginit,
+  &google_protobuf_EnumDescriptorProto_msginit,
+  &google_protobuf_FieldDescriptorProto_msginit,
+  &google_protobuf_FileOptions_msginit,
+  &google_protobuf_ServiceDescriptorProto_msginit,
+  &google_protobuf_SourceCodeInfo_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_FileDescriptorProto__fields[12] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {2, UPB_SIZE(12, 24), 2, 0, 9, 1},
+  {3, UPB_SIZE(36, 72), 0, 0, 9, 3},
+  {4, UPB_SIZE(40, 80), 0, 0, 11, 3},
+  {5, UPB_SIZE(44, 88), 0, 1, 11, 3},
+  {6, UPB_SIZE(48, 96), 0, 4, 11, 3},
+  {7, UPB_SIZE(52, 104), 0, 2, 11, 3},
+  {8, UPB_SIZE(28, 56), 4, 3, 11, 1},
+  {9, UPB_SIZE(32, 64), 5, 5, 11, 1},
+  {10, UPB_SIZE(56, 112), 0, 0, 5, 3},
+  {11, UPB_SIZE(60, 120), 0, 0, 5, 3},
+  {12, UPB_SIZE(20, 40), 3, 0, 9, 1},
+};
+
+const upb_msglayout google_protobuf_FileDescriptorProto_msginit = {
+  &google_protobuf_FileDescriptorProto_submsgs[0],
+  &google_protobuf_FileDescriptorProto__fields[0],
+  UPB_SIZE(64, 128), 12, false,
+};
+
+static const upb_msglayout *const google_protobuf_DescriptorProto_submsgs[8] = {
+  &google_protobuf_DescriptorProto_msginit,
+  &google_protobuf_DescriptorProto_ExtensionRange_msginit,
+  &google_protobuf_DescriptorProto_ReservedRange_msginit,
+  &google_protobuf_EnumDescriptorProto_msginit,
+  &google_protobuf_FieldDescriptorProto_msginit,
+  &google_protobuf_MessageOptions_msginit,
+  &google_protobuf_OneofDescriptorProto_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_DescriptorProto__fields[10] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {2, UPB_SIZE(16, 32), 0, 4, 11, 3},
+  {3, UPB_SIZE(20, 40), 0, 0, 11, 3},
+  {4, UPB_SIZE(24, 48), 0, 3, 11, 3},
+  {5, UPB_SIZE(28, 56), 0, 1, 11, 3},
+  {6, UPB_SIZE(32, 64), 0, 4, 11, 3},
+  {7, UPB_SIZE(12, 24), 2, 5, 11, 1},
+  {8, UPB_SIZE(36, 72), 0, 6, 11, 3},
+  {9, UPB_SIZE(40, 80), 0, 2, 11, 3},
+  {10, UPB_SIZE(44, 88), 0, 0, 9, 3},
+};
+
+const upb_msglayout google_protobuf_DescriptorProto_msginit = {
+  &google_protobuf_DescriptorProto_submsgs[0],
+  &google_protobuf_DescriptorProto__fields[0],
+  UPB_SIZE(48, 96), 10, false,
+};
+
+static const upb_msglayout *const google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
+  &google_protobuf_ExtensionRangeOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
+  {1, UPB_SIZE(4, 4), 1, 0, 5, 1},
+  {2, UPB_SIZE(8, 8), 2, 0, 5, 1},
+  {3, UPB_SIZE(12, 16), 3, 0, 11, 1},
+};
+
+const upb_msglayout google_protobuf_DescriptorProto_ExtensionRange_msginit = {
+  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
+  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
+  UPB_SIZE(16, 24), 3, false,
+};
+
+static const upb_msglayout_field google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
+  {1, UPB_SIZE(4, 4), 1, 0, 5, 1},
+  {2, UPB_SIZE(8, 8), 2, 0, 5, 1},
+};
+
+const upb_msglayout google_protobuf_DescriptorProto_ReservedRange_msginit = {
+  NULL,
+  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
+  UPB_SIZE(12, 12), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_ExtensionRangeOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_ExtensionRangeOptions__fields[1] = {
+  {999, UPB_SIZE(0, 0), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_ExtensionRangeOptions_msginit = {
+  &google_protobuf_ExtensionRangeOptions_submsgs[0],
+  &google_protobuf_ExtensionRangeOptions__fields[0],
+  UPB_SIZE(4, 8), 1, false,
+};
+
+static const upb_msglayout *const google_protobuf_FieldDescriptorProto_submsgs[1] = {
+  &google_protobuf_FieldOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_FieldDescriptorProto__fields[10] = {
+  {1, UPB_SIZE(32, 32), 5, 0, 9, 1},
+  {2, UPB_SIZE(40, 48), 6, 0, 9, 1},
+  {3, UPB_SIZE(24, 24), 3, 0, 5, 1},
+  {4, UPB_SIZE(8, 8), 1, 0, 14, 1},
+  {5, UPB_SIZE(16, 16), 2, 0, 14, 1},
+  {6, UPB_SIZE(48, 64), 7, 0, 9, 1},
+  {7, UPB_SIZE(56, 80), 8, 0, 9, 1},
+  {8, UPB_SIZE(72, 112), 10, 0, 11, 1},
+  {9, UPB_SIZE(28, 28), 4, 0, 5, 1},
+  {10, UPB_SIZE(64, 96), 9, 0, 9, 1},
+};
+
+const upb_msglayout google_protobuf_FieldDescriptorProto_msginit = {
+  &google_protobuf_FieldDescriptorProto_submsgs[0],
+  &google_protobuf_FieldDescriptorProto__fields[0],
+  UPB_SIZE(80, 128), 10, false,
+};
+
+static const upb_msglayout *const google_protobuf_OneofDescriptorProto_submsgs[1] = {
+  &google_protobuf_OneofOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_OneofDescriptorProto__fields[2] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {2, UPB_SIZE(12, 24), 2, 0, 11, 1},
+};
+
+const upb_msglayout google_protobuf_OneofDescriptorProto_msginit = {
+  &google_protobuf_OneofDescriptorProto_submsgs[0],
+  &google_protobuf_OneofDescriptorProto__fields[0],
+  UPB_SIZE(16, 32), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_EnumDescriptorProto_submsgs[3] = {
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit,
+  &google_protobuf_EnumOptions_msginit,
+  &google_protobuf_EnumValueDescriptorProto_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_EnumDescriptorProto__fields[5] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {2, UPB_SIZE(16, 32), 0, 2, 11, 3},
+  {3, UPB_SIZE(12, 24), 2, 1, 11, 1},
+  {4, UPB_SIZE(20, 40), 0, 0, 11, 3},
+  {5, UPB_SIZE(24, 48), 0, 0, 9, 3},
+};
+
+const upb_msglayout google_protobuf_EnumDescriptorProto_msginit = {
+  &google_protobuf_EnumDescriptorProto_submsgs[0],
+  &google_protobuf_EnumDescriptorProto__fields[0],
+  UPB_SIZE(32, 64), 5, false,
+};
+
+static const upb_msglayout_field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
+  {1, UPB_SIZE(4, 4), 1, 0, 5, 1},
+  {2, UPB_SIZE(8, 8), 2, 0, 5, 1},
+};
+
+const upb_msglayout google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = {
+  NULL,
+  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
+  UPB_SIZE(12, 12), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
+  &google_protobuf_EnumValueOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_EnumValueDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(8, 8), 2, 0, 9, 1},
+  {2, UPB_SIZE(4, 4), 1, 0, 5, 1},
+  {3, UPB_SIZE(16, 24), 3, 0, 11, 1},
+};
+
+const upb_msglayout google_protobuf_EnumValueDescriptorProto_msginit = {
+  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
+  &google_protobuf_EnumValueDescriptorProto__fields[0],
+  UPB_SIZE(24, 32), 3, false,
+};
+
+static const upb_msglayout *const google_protobuf_ServiceDescriptorProto_submsgs[2] = {
+  &google_protobuf_MethodDescriptorProto_msginit,
+  &google_protobuf_ServiceOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_ServiceDescriptorProto__fields[3] = {
+  {1, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {2, UPB_SIZE(16, 32), 0, 0, 11, 3},
+  {3, UPB_SIZE(12, 24), 2, 1, 11, 1},
+};
+
+const upb_msglayout google_protobuf_ServiceDescriptorProto_msginit = {
+  &google_protobuf_ServiceDescriptorProto_submsgs[0],
+  &google_protobuf_ServiceDescriptorProto__fields[0],
+  UPB_SIZE(24, 48), 3, false,
+};
+
+static const upb_msglayout *const google_protobuf_MethodDescriptorProto_submsgs[1] = {
+  &google_protobuf_MethodOptions_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_MethodDescriptorProto__fields[6] = {
+  {1, UPB_SIZE(4, 8), 3, 0, 9, 1},
+  {2, UPB_SIZE(12, 24), 4, 0, 9, 1},
+  {3, UPB_SIZE(20, 40), 5, 0, 9, 1},
+  {4, UPB_SIZE(28, 56), 6, 0, 11, 1},
+  {5, UPB_SIZE(1, 1), 1, 0, 8, 1},
+  {6, UPB_SIZE(2, 2), 2, 0, 8, 1},
+};
+
+const upb_msglayout google_protobuf_MethodDescriptorProto_msginit = {
+  &google_protobuf_MethodDescriptorProto_submsgs[0],
+  &google_protobuf_MethodDescriptorProto__fields[0],
+  UPB_SIZE(32, 64), 6, false,
+};
+
+static const upb_msglayout *const google_protobuf_FileOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_FileOptions__fields[21] = {
+  {1, UPB_SIZE(28, 32), 11, 0, 9, 1},
+  {8, UPB_SIZE(36, 48), 12, 0, 9, 1},
+  {9, UPB_SIZE(8, 8), 1, 0, 14, 1},
+  {10, UPB_SIZE(16, 16), 2, 0, 8, 1},
+  {11, UPB_SIZE(44, 64), 13, 0, 9, 1},
+  {16, UPB_SIZE(17, 17), 3, 0, 8, 1},
+  {17, UPB_SIZE(18, 18), 4, 0, 8, 1},
+  {18, UPB_SIZE(19, 19), 5, 0, 8, 1},
+  {20, UPB_SIZE(20, 20), 6, 0, 8, 1},
+  {23, UPB_SIZE(21, 21), 7, 0, 8, 1},
+  {27, UPB_SIZE(22, 22), 8, 0, 8, 1},
+  {31, UPB_SIZE(23, 23), 9, 0, 8, 1},
+  {36, UPB_SIZE(52, 80), 14, 0, 9, 1},
+  {37, UPB_SIZE(60, 96), 15, 0, 9, 1},
+  {39, UPB_SIZE(68, 112), 16, 0, 9, 1},
+  {40, UPB_SIZE(76, 128), 17, 0, 9, 1},
+  {41, UPB_SIZE(84, 144), 18, 0, 9, 1},
+  {42, UPB_SIZE(24, 24), 10, 0, 8, 1},
+  {44, UPB_SIZE(92, 160), 19, 0, 9, 1},
+  {45, UPB_SIZE(100, 176), 20, 0, 9, 1},
+  {999, UPB_SIZE(108, 192), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_FileOptions_msginit = {
+  &google_protobuf_FileOptions_submsgs[0],
+  &google_protobuf_FileOptions__fields[0],
+  UPB_SIZE(112, 208), 21, false,
+};
+
+static const upb_msglayout *const google_protobuf_MessageOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_MessageOptions__fields[5] = {
+  {1, UPB_SIZE(1, 1), 1, 0, 8, 1},
+  {2, UPB_SIZE(2, 2), 2, 0, 8, 1},
+  {3, UPB_SIZE(3, 3), 3, 0, 8, 1},
+  {7, UPB_SIZE(4, 4), 4, 0, 8, 1},
+  {999, UPB_SIZE(8, 8), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_MessageOptions_msginit = {
+  &google_protobuf_MessageOptions_submsgs[0],
+  &google_protobuf_MessageOptions__fields[0],
+  UPB_SIZE(12, 16), 5, false,
+};
+
+static const upb_msglayout *const google_protobuf_FieldOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_FieldOptions__fields[7] = {
+  {1, UPB_SIZE(8, 8), 1, 0, 14, 1},
+  {2, UPB_SIZE(24, 24), 3, 0, 8, 1},
+  {3, UPB_SIZE(25, 25), 4, 0, 8, 1},
+  {5, UPB_SIZE(26, 26), 5, 0, 8, 1},
+  {6, UPB_SIZE(16, 16), 2, 0, 14, 1},
+  {10, UPB_SIZE(27, 27), 6, 0, 8, 1},
+  {999, UPB_SIZE(28, 32), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_FieldOptions_msginit = {
+  &google_protobuf_FieldOptions_submsgs[0],
+  &google_protobuf_FieldOptions__fields[0],
+  UPB_SIZE(32, 40), 7, false,
+};
+
+static const upb_msglayout *const google_protobuf_OneofOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_OneofOptions__fields[1] = {
+  {999, UPB_SIZE(0, 0), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_OneofOptions_msginit = {
+  &google_protobuf_OneofOptions_submsgs[0],
+  &google_protobuf_OneofOptions__fields[0],
+  UPB_SIZE(4, 8), 1, false,
+};
+
+static const upb_msglayout *const google_protobuf_EnumOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_EnumOptions__fields[3] = {
+  {2, UPB_SIZE(1, 1), 1, 0, 8, 1},
+  {3, UPB_SIZE(2, 2), 2, 0, 8, 1},
+  {999, UPB_SIZE(4, 8), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_EnumOptions_msginit = {
+  &google_protobuf_EnumOptions_submsgs[0],
+  &google_protobuf_EnumOptions__fields[0],
+  UPB_SIZE(8, 16), 3, false,
+};
+
+static const upb_msglayout *const google_protobuf_EnumValueOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_EnumValueOptions__fields[2] = {
+  {1, UPB_SIZE(1, 1), 1, 0, 8, 1},
+  {999, UPB_SIZE(4, 8), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_EnumValueOptions_msginit = {
+  &google_protobuf_EnumValueOptions_submsgs[0],
+  &google_protobuf_EnumValueOptions__fields[0],
+  UPB_SIZE(8, 16), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_ServiceOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_ServiceOptions__fields[2] = {
+  {33, UPB_SIZE(1, 1), 1, 0, 8, 1},
+  {999, UPB_SIZE(4, 8), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_ServiceOptions_msginit = {
+  &google_protobuf_ServiceOptions_submsgs[0],
+  &google_protobuf_ServiceOptions__fields[0],
+  UPB_SIZE(8, 16), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_MethodOptions_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_MethodOptions__fields[3] = {
+  {33, UPB_SIZE(16, 16), 2, 0, 8, 1},
+  {34, UPB_SIZE(8, 8), 1, 0, 14, 1},
+  {999, UPB_SIZE(20, 24), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_MethodOptions_msginit = {
+  &google_protobuf_MethodOptions_submsgs[0],
+  &google_protobuf_MethodOptions__fields[0],
+  UPB_SIZE(24, 32), 3, false,
+};
+
+static const upb_msglayout *const google_protobuf_UninterpretedOption_submsgs[1] = {
+  &google_protobuf_UninterpretedOption_NamePart_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_UninterpretedOption__fields[7] = {
+  {2, UPB_SIZE(56, 80), 0, 0, 11, 3},
+  {3, UPB_SIZE(32, 32), 4, 0, 9, 1},
+  {4, UPB_SIZE(8, 8), 1, 0, 4, 1},
+  {5, UPB_SIZE(16, 16), 2, 0, 3, 1},
+  {6, UPB_SIZE(24, 24), 3, 0, 1, 1},
+  {7, UPB_SIZE(40, 48), 5, 0, 12, 1},
+  {8, UPB_SIZE(48, 64), 6, 0, 9, 1},
+};
+
+const upb_msglayout google_protobuf_UninterpretedOption_msginit = {
+  &google_protobuf_UninterpretedOption_submsgs[0],
+  &google_protobuf_UninterpretedOption__fields[0],
+  UPB_SIZE(64, 96), 7, false,
+};
+
+static const upb_msglayout_field google_protobuf_UninterpretedOption_NamePart__fields[2] = {
+  {1, UPB_SIZE(4, 8), 2, 0, 9, 2},
+  {2, UPB_SIZE(1, 1), 1, 0, 8, 2},
+};
+
+const upb_msglayout google_protobuf_UninterpretedOption_NamePart_msginit = {
+  NULL,
+  &google_protobuf_UninterpretedOption_NamePart__fields[0],
+  UPB_SIZE(16, 32), 2, false,
+};
+
+static const upb_msglayout *const google_protobuf_SourceCodeInfo_submsgs[1] = {
+  &google_protobuf_SourceCodeInfo_Location_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_SourceCodeInfo__fields[1] = {
+  {1, UPB_SIZE(0, 0), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_SourceCodeInfo_msginit = {
+  &google_protobuf_SourceCodeInfo_submsgs[0],
+  &google_protobuf_SourceCodeInfo__fields[0],
+  UPB_SIZE(4, 8), 1, false,
+};
+
+static const upb_msglayout_field google_protobuf_SourceCodeInfo_Location__fields[5] = {
+  {1, UPB_SIZE(20, 40), 0, 0, 5, 3},
+  {2, UPB_SIZE(24, 48), 0, 0, 5, 3},
+  {3, UPB_SIZE(4, 8), 1, 0, 9, 1},
+  {4, UPB_SIZE(12, 24), 2, 0, 9, 1},
+  {6, UPB_SIZE(28, 56), 0, 0, 9, 3},
+};
+
+const upb_msglayout google_protobuf_SourceCodeInfo_Location_msginit = {
+  NULL,
+  &google_protobuf_SourceCodeInfo_Location__fields[0],
+  UPB_SIZE(32, 64), 5, false,
+};
+
+static const upb_msglayout *const google_protobuf_GeneratedCodeInfo_submsgs[1] = {
+  &google_protobuf_GeneratedCodeInfo_Annotation_msginit,
+};
+
+static const upb_msglayout_field google_protobuf_GeneratedCodeInfo__fields[1] = {
+  {1, UPB_SIZE(0, 0), 0, 0, 11, 3},
+};
+
+const upb_msglayout google_protobuf_GeneratedCodeInfo_msginit = {
+  &google_protobuf_GeneratedCodeInfo_submsgs[0],
+  &google_protobuf_GeneratedCodeInfo__fields[0],
+  UPB_SIZE(4, 8), 1, false,
+};
+
+static const upb_msglayout_field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = {
+  {1, UPB_SIZE(20, 32), 0, 0, 5, 3},
+  {2, UPB_SIZE(12, 16), 3, 0, 9, 1},
+  {3, UPB_SIZE(4, 4), 1, 0, 5, 1},
+  {4, UPB_SIZE(8, 8), 2, 0, 5, 1},
+};
+
+const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit = {
+  NULL,
+  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
+  UPB_SIZE(24, 48), 4, false,
+};
+
+#include "upb/port_undef.inc"
+
--- a/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
+++ b/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -317,7 +317,6 @@ CORE_SOURCE_FILES = [
    'third_party/nanopb/pb_decode.c',
    'third_party/nanopb/pb_encode.c',
    'src/core/tsi/transport_security.cc',
-    'third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c',
    'third_party/upb/upb/decode.c',
    'third_party/upb/upb/encode.c',
    'third_party/upb/upb/msg.c',
--- a/src/upb/gen_build_yaml.py
+++ b/src/upb/gen_build_yaml.py
@ -22,7 +22,6 @@ import sys
 import yaml

 hdrs = [
-  "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.h",
  "third_party/upb/upb/decode.h",
  "third_party/upb/upb/encode.h",
  "third_party/upb/upb/generated_util.h",
@ -34,7 +33,6 @@ hdrs = [
 ]

 srcs = [
-  "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c",
  "third_party/upb/upb/decode.c",
  "third_party/upb/upb/encode.c",
  "third_party/upb/upb/msg.c",
--- a/templates/config.m4.template
+++ b/templates/config.m4.template
@ -14,7 +14,6 @@
    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/boringssl/include)
    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/nanopb)
    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/upb)
-    PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/upb/generated_for_cmake)

    LIBS="-lpthread $LIBS"

--- a/templates/config.w32.template
+++ b/templates/config.w32.template
@ -32,7 +32,6 @@
      "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
      "/I"+configure_module_dirname+"\\third_party\\nanopb "+
      "/I"+configure_module_dirname+"\\third_party\\upb "+
-      "/I"+configure_module_dirname+"\\third_party\\upb\\generated_for_cmake "+
      "/I"+configure_module_dirname+"\\third_party\\zlib ");
  <%
    dirs = {}
--- a/templates/gRPC-C++.podspec.template
+++ b/templates/gRPC-C++.podspec.template
@ -231,7 +231,5 @@
      find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
      find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
      find src/core/ src/cpp/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
-      find third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "third_party/upb/generated_for_cmake/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
-      find third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
    END_OF_COMMAND
  end
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -218,7 +218,5 @@
      find src/core/ third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
      find src/core/ src/cpp/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "src/core/ext/upb-generated/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
      find src/core/ src/cpp/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
-      find third_party/upb/ -type f \\( -name '*.h' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(.*).upb.h";#if COCOAPODS==1\\\n  #include  "third_party/upb/generated_for_cmake/\\1.upb.h"\\\n#else\\\n  #include  "\\1.upb.h"\\\n#endif;g'
-      find third_party/upb/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
    END_OF_COMMAND
  end
--- a/tools/codegen/core/gen_upb_api.sh
+++ b/tools/codegen/core/gen_upb_api.sh
@ -60,6 +60,7 @@ proto_files=( \
  "google/api/annotations.proto" \
  "google/api/http.proto" \
  "google/protobuf/any.proto" \
+  "google/protobuf/descriptor.proto" \
  "google/protobuf/duration.proto" \
  "google/protobuf/empty.proto" \
  "google/protobuf/struct.proto" \
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1296,7 +1296,6 @@ third_party/nanopb/pb.h \
 third_party/nanopb/pb_common.h \
 third_party/nanopb/pb_decode.h \
 third_party/nanopb/pb_encode.h \
-third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
 third_party/upb/upb/decode.c \
 third_party/upb/upb/encode.c \
 third_party/upb/upb/msg.c \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1597,7 +1597,6 @@ third_party/nanopb/pb_decode.c \
 third_party/nanopb/pb_decode.h \
 third_party/nanopb/pb_encode.c \
 third_party/nanopb/pb_encode.h \
-third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.c \
 third_party/upb/upb/decode.c \
 third_party/upb/upb/encode.c \
 third_party/upb/upb/msg.c \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -8308,6 +8308,7 @@
    "deps": [], 
    "headers": [
      "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", 
@ -8320,6 +8321,8 @@
    "src": [
      "src/core/ext/upb-generated/google/protobuf/any.upb.c", 
      "src/core/ext/upb-generated/google/protobuf/any.upb.h", 
+      "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", 
+      "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", 
      "src/core/ext/upb-generated/google/protobuf/duration.upb.c", 
      "src/core/ext/upb-generated/google/protobuf/duration.upb.h", 
      "src/core/ext/upb-generated/google/protobuf/empty.upb.c", 
@ -10947,7 +10950,6 @@
  {
    "deps": [], 
    "headers": [
-      "third_party/upb/generated_for_cmake/google/protobuf/descriptor.upb.h", 
      "third_party/upb/upb/decode.h", 
      "third_party/upb/upb/encode.h", 
      "third_party/upb/upb/generated_util.h",