diff --git a/.gitignore b/.gitignore
index 3de6a46..8f604b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@
 /grpc-1.26.0.tar.gz
 /release-1.10.0.tar.gz
 /googletest-release-1.10.0.tar.gz
+/grpc-1.36.4.tar.gz
+/grpc-1.37.0.tar.gz
+/grpc-1.37.1.tar.gz
diff --git a/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch b/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch
deleted file mode 100644
index d6b6489..0000000
--- a/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch
+++ /dev/null
@@ -1,2070 +0,0 @@
-From 72351f63fd650cc7acfcd2d0307e8e8e8f777283 Mon Sep 17 00:00:00 2001
-From: Esun Kim <veblush@google.com>
-Date: Tue, 14 Jan 2020 16:35:23 -0800
-Subject: [PATCH] Remove grpc sources from grpc++
-
----
- BUILD.gn                            | 240 -----------------
- CMakeLists.txt                      | 396 ----------------------------
- Makefile                            | 396 ----------------------------
- build.yaml                          |   1 -
- grpc.gyp                            | 396 ----------------------------
- tools/doxygen/Doxyfile.c++.internal | 240 -----------------
- 6 files changed, 1669 deletions(-)
-
-diff --git a/BUILD.gn b/BUILD.gn
-index 0599ae15048..8a4d6c7b23c 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -1191,135 +1191,32 @@ config("grpc_config") {
-         "include/grpcpp/support/sync_stream_impl.h",
-         "include/grpcpp/support/time.h",
-         "include/grpcpp/support/validate_service_config.h",
--        "src/core/ext/filters/client_channel/backend_metric.cc",
--        "src/core/ext/filters/client_channel/backend_metric.h",
--        "src/core/ext/filters/client_channel/backup_poller.cc",
--        "src/core/ext/filters/client_channel/backup_poller.h",
--        "src/core/ext/filters/client_channel/channel_connectivity.cc",
--        "src/core/ext/filters/client_channel/client_channel.cc",
--        "src/core/ext/filters/client_channel/client_channel.h",
--        "src/core/ext/filters/client_channel/client_channel_channelz.cc",
--        "src/core/ext/filters/client_channel/client_channel_channelz.h",
--        "src/core/ext/filters/client_channel/client_channel_factory.cc",
--        "src/core/ext/filters/client_channel/client_channel_factory.h",
--        "src/core/ext/filters/client_channel/client_channel_plugin.cc",
--        "src/core/ext/filters/client_channel/connector.h",
--        "src/core/ext/filters/client_channel/global_subchannel_pool.cc",
--        "src/core/ext/filters/client_channel/global_subchannel_pool.h",
--        "src/core/ext/filters/client_channel/health/health_check_client.cc",
--        "src/core/ext/filters/client_channel/health/health_check_client.h",
--        "src/core/ext/filters/client_channel/http_connect_handshaker.cc",
--        "src/core/ext/filters/client_channel/http_connect_handshaker.h",
--        "src/core/ext/filters/client_channel/http_proxy.cc",
--        "src/core/ext/filters/client_channel/http_proxy.h",
--        "src/core/ext/filters/client_channel/lb_policy.cc",
--        "src/core/ext/filters/client_channel/lb_policy.h",
--        "src/core/ext/filters/client_channel/lb_policy_factory.h",
--        "src/core/ext/filters/client_channel/lb_policy_registry.cc",
--        "src/core/ext/filters/client_channel/lb_policy_registry.h",
--        "src/core/ext/filters/client_channel/local_subchannel_pool.cc",
--        "src/core/ext/filters/client_channel/local_subchannel_pool.h",
--        "src/core/ext/filters/client_channel/parse_address.cc",
--        "src/core/ext/filters/client_channel/parse_address.h",
--        "src/core/ext/filters/client_channel/proxy_mapper.h",
--        "src/core/ext/filters/client_channel/proxy_mapper_registry.cc",
--        "src/core/ext/filters/client_channel/proxy_mapper_registry.h",
--        "src/core/ext/filters/client_channel/resolver.cc",
--        "src/core/ext/filters/client_channel/resolver.h",
--        "src/core/ext/filters/client_channel/resolver_factory.h",
--        "src/core/ext/filters/client_channel/resolver_registry.cc",
--        "src/core/ext/filters/client_channel/resolver_registry.h",
--        "src/core/ext/filters/client_channel/resolver_result_parsing.cc",
--        "src/core/ext/filters/client_channel/resolver_result_parsing.h",
--        "src/core/ext/filters/client_channel/resolving_lb_policy.cc",
--        "src/core/ext/filters/client_channel/resolving_lb_policy.h",
--        "src/core/ext/filters/client_channel/retry_throttle.cc",
--        "src/core/ext/filters/client_channel/retry_throttle.h",
--        "src/core/ext/filters/client_channel/server_address.cc",
--        "src/core/ext/filters/client_channel/server_address.h",
--        "src/core/ext/filters/client_channel/service_config.cc",
--        "src/core/ext/filters/client_channel/service_config.h",
--        "src/core/ext/filters/client_channel/subchannel.cc",
--        "src/core/ext/filters/client_channel/subchannel.h",
--        "src/core/ext/filters/client_channel/subchannel_interface.h",
--        "src/core/ext/filters/client_channel/subchannel_pool_interface.cc",
--        "src/core/ext/filters/client_channel/subchannel_pool_interface.h",
--        "src/core/ext/filters/deadline/deadline_filter.cc",
--        "src/core/ext/filters/deadline/deadline_filter.h",
-         "src/core/ext/transport/inproc/inproc_transport.h",
--        "src/core/ext/upb-generated/gogoproto/gogo.upb.c",
--        "src/core/ext/upb-generated/gogoproto/gogo.upb.h",
--        "src/core/ext/upb-generated/google/api/annotations.upb.c",
--        "src/core/ext/upb-generated/google/api/annotations.upb.h",
--        "src/core/ext/upb-generated/google/api/http.upb.c",
--        "src/core/ext/upb-generated/google/api/http.upb.h",
--        "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",
--        "src/core/ext/upb-generated/google/protobuf/empty.upb.h",
--        "src/core/ext/upb-generated/google/protobuf/struct.upb.c",
--        "src/core/ext/upb-generated/google/protobuf/struct.upb.h",
--        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c",
--        "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h",
--        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c",
--        "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h",
--        "src/core/ext/upb-generated/google/rpc/status.upb.c",
--        "src/core/ext/upb-generated/google/rpc/status.upb.h",
-         "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c",
-         "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.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/lib/avl/avl.cc",
-         "src/core/lib/avl/avl.h",
--        "src/core/lib/backoff/backoff.cc",
-         "src/core/lib/backoff/backoff.h",
--        "src/core/lib/channel/channel_args.cc",
-         "src/core/lib/channel/channel_args.h",
--        "src/core/lib/channel/channel_stack.cc",
-         "src/core/lib/channel/channel_stack.h",
--        "src/core/lib/channel/channel_stack_builder.cc",
-         "src/core/lib/channel/channel_stack_builder.h",
--        "src/core/lib/channel/channel_trace.cc",
-         "src/core/lib/channel/channel_trace.h",
--        "src/core/lib/channel/channelz.cc",
-         "src/core/lib/channel/channelz.h",
--        "src/core/lib/channel/channelz_registry.cc",
-         "src/core/lib/channel/channelz_registry.h",
--        "src/core/lib/channel/connected_channel.cc",
-         "src/core/lib/channel/connected_channel.h",
-         "src/core/lib/channel/context.h",
--        "src/core/lib/channel/handshaker.cc",
-         "src/core/lib/channel/handshaker.h",
-         "src/core/lib/channel/handshaker_factory.h",
--        "src/core/lib/channel/handshaker_registry.cc",
-         "src/core/lib/channel/handshaker_registry.h",
--        "src/core/lib/channel/status_util.cc",
-         "src/core/lib/channel/status_util.h",
-         "src/core/lib/compression/algorithm_metadata.h",
--        "src/core/lib/compression/compression.cc",
--        "src/core/lib/compression/compression_args.cc",
-         "src/core/lib/compression/compression_args.h",
--        "src/core/lib/compression/compression_internal.cc",
-         "src/core/lib/compression/compression_internal.h",
--        "src/core/lib/compression/message_compress.cc",
-         "src/core/lib/compression/message_compress.h",
--        "src/core/lib/compression/stream_compression.cc",
-         "src/core/lib/compression/stream_compression.h",
--        "src/core/lib/compression/stream_compression_gzip.cc",
-         "src/core/lib/compression/stream_compression_gzip.h",
--        "src/core/lib/compression/stream_compression_identity.cc",
-         "src/core/lib/compression/stream_compression_identity.h",
--        "src/core/lib/debug/stats.cc",
-         "src/core/lib/debug/stats.h",
--        "src/core/lib/debug/stats_data.cc",
-         "src/core/lib/debug/stats_data.h",
--        "src/core/lib/debug/trace.cc",
-         "src/core/lib/debug/trace.h",
-         "src/core/lib/gpr/alloc.h",
-         "src/core/lib/gpr/arena.h",
-@@ -1356,257 +1253,120 @@ config("grpc_config") {
-         "src/core/lib/gprpp/string_view.h",
-         "src/core/lib/gprpp/sync.h",
-         "src/core/lib/gprpp/thd.h",
--        "src/core/lib/http/format_request.cc",
-         "src/core/lib/http/format_request.h",
--        "src/core/lib/http/httpcli.cc",
-         "src/core/lib/http/httpcli.h",
--        "src/core/lib/http/parser.cc",
-         "src/core/lib/http/parser.h",
-         "src/core/lib/iomgr/block_annotate.h",
--        "src/core/lib/iomgr/buffer_list.cc",
-         "src/core/lib/iomgr/buffer_list.h",
--        "src/core/lib/iomgr/call_combiner.cc",
-         "src/core/lib/iomgr/call_combiner.h",
--        "src/core/lib/iomgr/cfstream_handle.cc",
-         "src/core/lib/iomgr/cfstream_handle.h",
-         "src/core/lib/iomgr/closure.h",
--        "src/core/lib/iomgr/combiner.cc",
-         "src/core/lib/iomgr/combiner.h",
-         "src/core/lib/iomgr/dynamic_annotations.h",
--        "src/core/lib/iomgr/endpoint.cc",
-         "src/core/lib/iomgr/endpoint.h",
--        "src/core/lib/iomgr/endpoint_cfstream.cc",
-         "src/core/lib/iomgr/endpoint_cfstream.h",
-         "src/core/lib/iomgr/endpoint_pair.h",
--        "src/core/lib/iomgr/endpoint_pair_posix.cc",
--        "src/core/lib/iomgr/endpoint_pair_uv.cc",
--        "src/core/lib/iomgr/endpoint_pair_windows.cc",
--        "src/core/lib/iomgr/error.cc",
-         "src/core/lib/iomgr/error.h",
--        "src/core/lib/iomgr/error_cfstream.cc",
-         "src/core/lib/iomgr/error_cfstream.h",
-         "src/core/lib/iomgr/error_internal.h",
--        "src/core/lib/iomgr/ev_epoll1_linux.cc",
-         "src/core/lib/iomgr/ev_epoll1_linux.h",
--        "src/core/lib/iomgr/ev_epollex_linux.cc",
-         "src/core/lib/iomgr/ev_epollex_linux.h",
--        "src/core/lib/iomgr/ev_poll_posix.cc",
-         "src/core/lib/iomgr/ev_poll_posix.h",
--        "src/core/lib/iomgr/ev_posix.cc",
-         "src/core/lib/iomgr/ev_posix.h",
--        "src/core/lib/iomgr/ev_windows.cc",
--        "src/core/lib/iomgr/exec_ctx.cc",
-         "src/core/lib/iomgr/exec_ctx.h",
--        "src/core/lib/iomgr/executor.cc",
-         "src/core/lib/iomgr/executor.h",
--        "src/core/lib/iomgr/executor/mpmcqueue.cc",
-         "src/core/lib/iomgr/executor/mpmcqueue.h",
--        "src/core/lib/iomgr/executor/threadpool.cc",
-         "src/core/lib/iomgr/executor/threadpool.h",
--        "src/core/lib/iomgr/fork_posix.cc",
--        "src/core/lib/iomgr/fork_windows.cc",
-         "src/core/lib/iomgr/gethostname.h",
--        "src/core/lib/iomgr/gethostname_fallback.cc",
--        "src/core/lib/iomgr/gethostname_host_name_max.cc",
--        "src/core/lib/iomgr/gethostname_sysconf.cc",
-         "src/core/lib/iomgr/grpc_if_nametoindex.h",
--        "src/core/lib/iomgr/grpc_if_nametoindex_posix.cc",
--        "src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc",
--        "src/core/lib/iomgr/internal_errqueue.cc",
-         "src/core/lib/iomgr/internal_errqueue.h",
--        "src/core/lib/iomgr/iocp_windows.cc",
-         "src/core/lib/iomgr/iocp_windows.h",
--        "src/core/lib/iomgr/iomgr.cc",
-         "src/core/lib/iomgr/iomgr.h",
--        "src/core/lib/iomgr/iomgr_custom.cc",
-         "src/core/lib/iomgr/iomgr_custom.h",
--        "src/core/lib/iomgr/iomgr_internal.cc",
-         "src/core/lib/iomgr/iomgr_internal.h",
--        "src/core/lib/iomgr/iomgr_posix.cc",
-         "src/core/lib/iomgr/iomgr_posix.h",
--        "src/core/lib/iomgr/iomgr_posix_cfstream.cc",
--        "src/core/lib/iomgr/iomgr_uv.cc",
--        "src/core/lib/iomgr/iomgr_windows.cc",
--        "src/core/lib/iomgr/is_epollexclusive_available.cc",
-         "src/core/lib/iomgr/is_epollexclusive_available.h",
--        "src/core/lib/iomgr/load_file.cc",
-         "src/core/lib/iomgr/load_file.h",
--        "src/core/lib/iomgr/lockfree_event.cc",
-         "src/core/lib/iomgr/lockfree_event.h",
--        "src/core/lib/iomgr/logical_thread.cc",
-         "src/core/lib/iomgr/logical_thread.h",
-         "src/core/lib/iomgr/nameser.h",
--        "src/core/lib/iomgr/polling_entity.cc",
-         "src/core/lib/iomgr/polling_entity.h",
--        "src/core/lib/iomgr/pollset.cc",
-         "src/core/lib/iomgr/pollset.h",
--        "src/core/lib/iomgr/pollset_custom.cc",
-         "src/core/lib/iomgr/pollset_custom.h",
--        "src/core/lib/iomgr/pollset_set.cc",
-         "src/core/lib/iomgr/pollset_set.h",
--        "src/core/lib/iomgr/pollset_set_custom.cc",
-         "src/core/lib/iomgr/pollset_set_custom.h",
--        "src/core/lib/iomgr/pollset_set_windows.cc",
-         "src/core/lib/iomgr/pollset_set_windows.h",
--        "src/core/lib/iomgr/pollset_uv.cc",
--        "src/core/lib/iomgr/pollset_windows.cc",
-         "src/core/lib/iomgr/pollset_windows.h",
-         "src/core/lib/iomgr/port.h",
--        "src/core/lib/iomgr/resolve_address.cc",
-         "src/core/lib/iomgr/resolve_address.h",
--        "src/core/lib/iomgr/resolve_address_custom.cc",
-         "src/core/lib/iomgr/resolve_address_custom.h",
--        "src/core/lib/iomgr/resolve_address_posix.cc",
--        "src/core/lib/iomgr/resolve_address_windows.cc",
--        "src/core/lib/iomgr/resource_quota.cc",
-         "src/core/lib/iomgr/resource_quota.h",
-         "src/core/lib/iomgr/sockaddr.h",
-         "src/core/lib/iomgr/sockaddr_custom.h",
-         "src/core/lib/iomgr/sockaddr_posix.h",
--        "src/core/lib/iomgr/sockaddr_utils.cc",
-         "src/core/lib/iomgr/sockaddr_utils.h",
-         "src/core/lib/iomgr/sockaddr_windows.h",
--        "src/core/lib/iomgr/socket_factory_posix.cc",
-         "src/core/lib/iomgr/socket_factory_posix.h",
--        "src/core/lib/iomgr/socket_mutator.cc",
-         "src/core/lib/iomgr/socket_mutator.h",
-         "src/core/lib/iomgr/socket_utils.h",
--        "src/core/lib/iomgr/socket_utils_common_posix.cc",
--        "src/core/lib/iomgr/socket_utils_linux.cc",
--        "src/core/lib/iomgr/socket_utils_posix.cc",
-         "src/core/lib/iomgr/socket_utils_posix.h",
--        "src/core/lib/iomgr/socket_utils_uv.cc",
--        "src/core/lib/iomgr/socket_utils_windows.cc",
--        "src/core/lib/iomgr/socket_windows.cc",
-         "src/core/lib/iomgr/socket_windows.h",
-         "src/core/lib/iomgr/sys_epoll_wrapper.h",
--        "src/core/lib/iomgr/tcp_client.cc",
-         "src/core/lib/iomgr/tcp_client.h",
--        "src/core/lib/iomgr/tcp_client_cfstream.cc",
--        "src/core/lib/iomgr/tcp_client_custom.cc",
--        "src/core/lib/iomgr/tcp_client_posix.cc",
-         "src/core/lib/iomgr/tcp_client_posix.h",
--        "src/core/lib/iomgr/tcp_client_windows.cc",
--        "src/core/lib/iomgr/tcp_custom.cc",
-         "src/core/lib/iomgr/tcp_custom.h",
--        "src/core/lib/iomgr/tcp_posix.cc",
-         "src/core/lib/iomgr/tcp_posix.h",
--        "src/core/lib/iomgr/tcp_server.cc",
-         "src/core/lib/iomgr/tcp_server.h",
--        "src/core/lib/iomgr/tcp_server_custom.cc",
--        "src/core/lib/iomgr/tcp_server_posix.cc",
-         "src/core/lib/iomgr/tcp_server_utils_posix.h",
--        "src/core/lib/iomgr/tcp_server_utils_posix_common.cc",
--        "src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc",
--        "src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc",
--        "src/core/lib/iomgr/tcp_server_windows.cc",
--        "src/core/lib/iomgr/tcp_uv.cc",
--        "src/core/lib/iomgr/tcp_windows.cc",
-         "src/core/lib/iomgr/tcp_windows.h",
--        "src/core/lib/iomgr/time_averaged_stats.cc",
-         "src/core/lib/iomgr/time_averaged_stats.h",
--        "src/core/lib/iomgr/timer.cc",
-         "src/core/lib/iomgr/timer.h",
--        "src/core/lib/iomgr/timer_custom.cc",
-         "src/core/lib/iomgr/timer_custom.h",
--        "src/core/lib/iomgr/timer_generic.cc",
--        "src/core/lib/iomgr/timer_heap.cc",
-         "src/core/lib/iomgr/timer_heap.h",
--        "src/core/lib/iomgr/timer_manager.cc",
-         "src/core/lib/iomgr/timer_manager.h",
--        "src/core/lib/iomgr/timer_uv.cc",
--        "src/core/lib/iomgr/udp_server.cc",
-         "src/core/lib/iomgr/udp_server.h",
--        "src/core/lib/iomgr/unix_sockets_posix.cc",
-         "src/core/lib/iomgr/unix_sockets_posix.h",
--        "src/core/lib/iomgr/unix_sockets_posix_noop.cc",
--        "src/core/lib/iomgr/wakeup_fd_eventfd.cc",
--        "src/core/lib/iomgr/wakeup_fd_nospecial.cc",
--        "src/core/lib/iomgr/wakeup_fd_pipe.cc",
-         "src/core/lib/iomgr/wakeup_fd_pipe.h",
--        "src/core/lib/iomgr/wakeup_fd_posix.cc",
-         "src/core/lib/iomgr/wakeup_fd_posix.h",
--        "src/core/lib/json/json.cc",
-         "src/core/lib/json/json.h",
-         "src/core/lib/json/json_common.h",
--        "src/core/lib/json/json_reader.cc",
-         "src/core/lib/json/json_reader.h",
--        "src/core/lib/json/json_string.cc",
--        "src/core/lib/json/json_writer.cc",
-         "src/core/lib/json/json_writer.h",
-         "src/core/lib/profiling/timers.h",
--        "src/core/lib/slice/b64.cc",
-         "src/core/lib/slice/b64.h",
--        "src/core/lib/slice/percent_encoding.cc",
-         "src/core/lib/slice/percent_encoding.h",
--        "src/core/lib/slice/slice.cc",
--        "src/core/lib/slice/slice_buffer.cc",
-         "src/core/lib/slice/slice_hash_table.h",
--        "src/core/lib/slice/slice_intern.cc",
-         "src/core/lib/slice/slice_internal.h",
--        "src/core/lib/slice/slice_string_helpers.cc",
-         "src/core/lib/slice/slice_string_helpers.h",
-         "src/core/lib/slice/slice_utils.h",
-         "src/core/lib/slice/slice_weak_hash_table.h",
--        "src/core/lib/surface/api_trace.cc",
-         "src/core/lib/surface/api_trace.h",
--        "src/core/lib/surface/byte_buffer.cc",
--        "src/core/lib/surface/byte_buffer_reader.cc",
--        "src/core/lib/surface/call.cc",
-         "src/core/lib/surface/call.h",
--        "src/core/lib/surface/call_details.cc",
--        "src/core/lib/surface/call_log_batch.cc",
-         "src/core/lib/surface/call_test_only.h",
--        "src/core/lib/surface/channel.cc",
-         "src/core/lib/surface/channel.h",
--        "src/core/lib/surface/channel_init.cc",
-         "src/core/lib/surface/channel_init.h",
--        "src/core/lib/surface/channel_ping.cc",
--        "src/core/lib/surface/channel_stack_type.cc",
-         "src/core/lib/surface/channel_stack_type.h",
--        "src/core/lib/surface/completion_queue.cc",
-         "src/core/lib/surface/completion_queue.h",
--        "src/core/lib/surface/completion_queue_factory.cc",
-         "src/core/lib/surface/completion_queue_factory.h",
--        "src/core/lib/surface/event_string.cc",
-         "src/core/lib/surface/event_string.h",
-         "src/core/lib/surface/init.h",
--        "src/core/lib/surface/lame_client.cc",
-         "src/core/lib/surface/lame_client.h",
--        "src/core/lib/surface/metadata_array.cc",
--        "src/core/lib/surface/server.cc",
-         "src/core/lib/surface/server.h",
--        "src/core/lib/surface/validate_metadata.cc",
-         "src/core/lib/surface/validate_metadata.h",
--        "src/core/lib/surface/version.cc",
--        "src/core/lib/transport/bdp_estimator.cc",
-         "src/core/lib/transport/bdp_estimator.h",
--        "src/core/lib/transport/byte_stream.cc",
-         "src/core/lib/transport/byte_stream.h",
--        "src/core/lib/transport/connectivity_state.cc",
-         "src/core/lib/transport/connectivity_state.h",
--        "src/core/lib/transport/error_utils.cc",
-         "src/core/lib/transport/error_utils.h",
-         "src/core/lib/transport/http2_errors.h",
--        "src/core/lib/transport/metadata.cc",
-         "src/core/lib/transport/metadata.h",
--        "src/core/lib/transport/metadata_batch.cc",
-         "src/core/lib/transport/metadata_batch.h",
--        "src/core/lib/transport/pid_controller.cc",
-         "src/core/lib/transport/pid_controller.h",
--        "src/core/lib/transport/static_metadata.cc",
-         "src/core/lib/transport/static_metadata.h",
--        "src/core/lib/transport/status_conversion.cc",
-         "src/core/lib/transport/status_conversion.h",
--        "src/core/lib/transport/status_metadata.cc",
-         "src/core/lib/transport/status_metadata.h",
--        "src/core/lib/transport/timeout_encoding.cc",
-         "src/core/lib/transport/timeout_encoding.h",
--        "src/core/lib/transport/transport.cc",
-         "src/core/lib/transport/transport.h",
-         "src/core/lib/transport/transport_impl.h",
--        "src/core/lib/transport/transport_op_string.cc",
--        "src/core/lib/uri/uri_parser.cc",
-         "src/core/lib/uri/uri_parser.h",
-         "src/cpp/client/channel_cc.cc",
-         "src/cpp/client/client_context.cc",
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d4418ad619..be27010428f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3299,205 +3299,7 @@ add_library(grpc++
-   src/cpp/util/status.cc
-   src/cpp/util/string_ref.cc
-   src/cpp/util/time_cc.cc
--  src/core/ext/filters/client_channel/backend_metric.cc
--  src/core/ext/filters/client_channel/backup_poller.cc
--  src/core/ext/filters/client_channel/channel_connectivity.cc
--  src/core/ext/filters/client_channel/client_channel.cc
--  src/core/ext/filters/client_channel/client_channel_channelz.cc
--  src/core/ext/filters/client_channel/client_channel_factory.cc
--  src/core/ext/filters/client_channel/client_channel_plugin.cc
--  src/core/ext/filters/client_channel/global_subchannel_pool.cc
--  src/core/ext/filters/client_channel/health/health_check_client.cc
--  src/core/ext/filters/client_channel/http_connect_handshaker.cc
--  src/core/ext/filters/client_channel/http_proxy.cc
--  src/core/ext/filters/client_channel/lb_policy.cc
--  src/core/ext/filters/client_channel/lb_policy_registry.cc
--  src/core/ext/filters/client_channel/local_subchannel_pool.cc
--  src/core/ext/filters/client_channel/parse_address.cc
--  src/core/ext/filters/client_channel/proxy_mapper_registry.cc
--  src/core/ext/filters/client_channel/resolver.cc
--  src/core/ext/filters/client_channel/resolver_registry.cc
--  src/core/ext/filters/client_channel/resolver_result_parsing.cc
--  src/core/ext/filters/client_channel/resolving_lb_policy.cc
--  src/core/ext/filters/client_channel/retry_throttle.cc
--  src/core/ext/filters/client_channel/server_address.cc
--  src/core/ext/filters/client_channel/service_config.cc
--  src/core/ext/filters/client_channel/subchannel.cc
--  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
--  src/core/lib/avl/avl.cc
--  src/core/lib/backoff/backoff.cc
--  src/core/lib/channel/channel_args.cc
--  src/core/lib/channel/channel_stack.cc
--  src/core/lib/channel/channel_stack_builder.cc
--  src/core/lib/channel/channel_trace.cc
--  src/core/lib/channel/channelz.cc
--  src/core/lib/channel/channelz_registry.cc
--  src/core/lib/channel/connected_channel.cc
--  src/core/lib/channel/handshaker.cc
--  src/core/lib/channel/handshaker_registry.cc
--  src/core/lib/channel/status_util.cc
--  src/core/lib/compression/compression.cc
--  src/core/lib/compression/compression_args.cc
--  src/core/lib/compression/compression_internal.cc
--  src/core/lib/compression/message_compress.cc
--  src/core/lib/compression/stream_compression.cc
--  src/core/lib/compression/stream_compression_gzip.cc
--  src/core/lib/compression/stream_compression_identity.cc
--  src/core/lib/debug/stats.cc
--  src/core/lib/debug/stats_data.cc
--  src/core/lib/http/format_request.cc
--  src/core/lib/http/httpcli.cc
--  src/core/lib/http/parser.cc
--  src/core/lib/iomgr/buffer_list.cc
--  src/core/lib/iomgr/call_combiner.cc
--  src/core/lib/iomgr/cfstream_handle.cc
--  src/core/lib/iomgr/combiner.cc
--  src/core/lib/iomgr/endpoint.cc
--  src/core/lib/iomgr/endpoint_cfstream.cc
--  src/core/lib/iomgr/endpoint_pair_posix.cc
--  src/core/lib/iomgr/endpoint_pair_uv.cc
--  src/core/lib/iomgr/endpoint_pair_windows.cc
--  src/core/lib/iomgr/error.cc
--  src/core/lib/iomgr/error_cfstream.cc
--  src/core/lib/iomgr/ev_epoll1_linux.cc
--  src/core/lib/iomgr/ev_epollex_linux.cc
--  src/core/lib/iomgr/ev_poll_posix.cc
--  src/core/lib/iomgr/ev_posix.cc
--  src/core/lib/iomgr/ev_windows.cc
--  src/core/lib/iomgr/exec_ctx.cc
--  src/core/lib/iomgr/executor.cc
--  src/core/lib/iomgr/executor/mpmcqueue.cc
--  src/core/lib/iomgr/executor/threadpool.cc
--  src/core/lib/iomgr/fork_posix.cc
--  src/core/lib/iomgr/fork_windows.cc
--  src/core/lib/iomgr/gethostname_fallback.cc
--  src/core/lib/iomgr/gethostname_host_name_max.cc
--  src/core/lib/iomgr/gethostname_sysconf.cc
--  src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
--  src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
--  src/core/lib/iomgr/internal_errqueue.cc
--  src/core/lib/iomgr/iocp_windows.cc
--  src/core/lib/iomgr/iomgr.cc
--  src/core/lib/iomgr/iomgr_custom.cc
--  src/core/lib/iomgr/iomgr_internal.cc
--  src/core/lib/iomgr/iomgr_posix.cc
--  src/core/lib/iomgr/iomgr_posix_cfstream.cc
--  src/core/lib/iomgr/iomgr_uv.cc
--  src/core/lib/iomgr/iomgr_windows.cc
--  src/core/lib/iomgr/is_epollexclusive_available.cc
--  src/core/lib/iomgr/load_file.cc
--  src/core/lib/iomgr/lockfree_event.cc
--  src/core/lib/iomgr/logical_thread.cc
--  src/core/lib/iomgr/polling_entity.cc
--  src/core/lib/iomgr/pollset.cc
--  src/core/lib/iomgr/pollset_custom.cc
--  src/core/lib/iomgr/pollset_set.cc
--  src/core/lib/iomgr/pollset_set_custom.cc
--  src/core/lib/iomgr/pollset_set_windows.cc
--  src/core/lib/iomgr/pollset_uv.cc
--  src/core/lib/iomgr/pollset_windows.cc
--  src/core/lib/iomgr/resolve_address.cc
--  src/core/lib/iomgr/resolve_address_custom.cc
--  src/core/lib/iomgr/resolve_address_posix.cc
--  src/core/lib/iomgr/resolve_address_windows.cc
--  src/core/lib/iomgr/resource_quota.cc
--  src/core/lib/iomgr/sockaddr_utils.cc
--  src/core/lib/iomgr/socket_factory_posix.cc
--  src/core/lib/iomgr/socket_mutator.cc
--  src/core/lib/iomgr/socket_utils_common_posix.cc
--  src/core/lib/iomgr/socket_utils_linux.cc
--  src/core/lib/iomgr/socket_utils_posix.cc
--  src/core/lib/iomgr/socket_utils_uv.cc
--  src/core/lib/iomgr/socket_utils_windows.cc
--  src/core/lib/iomgr/socket_windows.cc
--  src/core/lib/iomgr/tcp_client.cc
--  src/core/lib/iomgr/tcp_client_cfstream.cc
--  src/core/lib/iomgr/tcp_client_custom.cc
--  src/core/lib/iomgr/tcp_client_posix.cc
--  src/core/lib/iomgr/tcp_client_windows.cc
--  src/core/lib/iomgr/tcp_custom.cc
--  src/core/lib/iomgr/tcp_posix.cc
--  src/core/lib/iomgr/tcp_server.cc
--  src/core/lib/iomgr/tcp_server_custom.cc
--  src/core/lib/iomgr/tcp_server_posix.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_common.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
--  src/core/lib/iomgr/tcp_server_windows.cc
--  src/core/lib/iomgr/tcp_uv.cc
--  src/core/lib/iomgr/tcp_windows.cc
--  src/core/lib/iomgr/time_averaged_stats.cc
--  src/core/lib/iomgr/timer.cc
--  src/core/lib/iomgr/timer_custom.cc
--  src/core/lib/iomgr/timer_generic.cc
--  src/core/lib/iomgr/timer_heap.cc
--  src/core/lib/iomgr/timer_manager.cc
--  src/core/lib/iomgr/timer_uv.cc
--  src/core/lib/iomgr/udp_server.cc
--  src/core/lib/iomgr/unix_sockets_posix.cc
--  src/core/lib/iomgr/unix_sockets_posix_noop.cc
--  src/core/lib/iomgr/wakeup_fd_eventfd.cc
--  src/core/lib/iomgr/wakeup_fd_nospecial.cc
--  src/core/lib/iomgr/wakeup_fd_pipe.cc
--  src/core/lib/iomgr/wakeup_fd_posix.cc
--  src/core/lib/json/json.cc
--  src/core/lib/json/json_reader.cc
--  src/core/lib/json/json_string.cc
--  src/core/lib/json/json_writer.cc
--  src/core/lib/slice/b64.cc
--  src/core/lib/slice/percent_encoding.cc
--  src/core/lib/slice/slice.cc
--  src/core/lib/slice/slice_buffer.cc
--  src/core/lib/slice/slice_intern.cc
--  src/core/lib/slice/slice_string_helpers.cc
--  src/core/lib/surface/api_trace.cc
--  src/core/lib/surface/byte_buffer.cc
--  src/core/lib/surface/byte_buffer_reader.cc
--  src/core/lib/surface/call.cc
--  src/core/lib/surface/call_details.cc
--  src/core/lib/surface/call_log_batch.cc
--  src/core/lib/surface/channel.cc
--  src/core/lib/surface/channel_init.cc
--  src/core/lib/surface/channel_ping.cc
--  src/core/lib/surface/channel_stack_type.cc
--  src/core/lib/surface/completion_queue.cc
--  src/core/lib/surface/completion_queue_factory.cc
--  src/core/lib/surface/event_string.cc
--  src/core/lib/surface/lame_client.cc
--  src/core/lib/surface/metadata_array.cc
--  src/core/lib/surface/server.cc
--  src/core/lib/surface/validate_metadata.cc
--  src/core/lib/surface/version.cc
--  src/core/lib/transport/bdp_estimator.cc
--  src/core/lib/transport/byte_stream.cc
--  src/core/lib/transport/connectivity_state.cc
--  src/core/lib/transport/error_utils.cc
--  src/core/lib/transport/metadata.cc
--  src/core/lib/transport/metadata_batch.cc
--  src/core/lib/transport/pid_controller.cc
--  src/core/lib/transport/static_metadata.cc
--  src/core/lib/transport/status_conversion.cc
--  src/core/lib/transport/status_metadata.cc
--  src/core/lib/transport/timeout_encoding.cc
--  src/core/lib/transport/transport.cc
--  src/core/lib/transport/transport_op_string.cc
--  src/core/lib/uri/uri_parser.cc
--  src/core/lib/debug/trace.cc
--  src/core/ext/filters/deadline/deadline_filter.cc
-   src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
--  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
--  src/core/ext/upb-generated/gogoproto/gogo.upb.c
--  src/core/ext/upb-generated/validate/validate.upb.c
--  src/core/ext/upb-generated/google/api/annotations.upb.c
--  src/core/ext/upb-generated/google/api/http.upb.c
--  src/core/ext/upb-generated/google/protobuf/any.upb.c
--  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
--  src/core/ext/upb-generated/google/protobuf/duration.upb.c
--  src/core/ext/upb-generated/google/protobuf/empty.upb.c
--  src/core/ext/upb-generated/google/protobuf/struct.upb.c
--  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
--  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
--  src/core/ext/upb-generated/google/rpc/status.upb.c
-   src/cpp/codegen/codegen_init.cc
- )
- 
-@@ -4564,205 +4366,7 @@ add_library(grpc++_unsecure
-   src/cpp/util/status.cc
-   src/cpp/util/string_ref.cc
-   src/cpp/util/time_cc.cc
--  src/core/ext/filters/client_channel/backend_metric.cc
--  src/core/ext/filters/client_channel/backup_poller.cc
--  src/core/ext/filters/client_channel/channel_connectivity.cc
--  src/core/ext/filters/client_channel/client_channel.cc
--  src/core/ext/filters/client_channel/client_channel_channelz.cc
--  src/core/ext/filters/client_channel/client_channel_factory.cc
--  src/core/ext/filters/client_channel/client_channel_plugin.cc
--  src/core/ext/filters/client_channel/global_subchannel_pool.cc
--  src/core/ext/filters/client_channel/health/health_check_client.cc
--  src/core/ext/filters/client_channel/http_connect_handshaker.cc
--  src/core/ext/filters/client_channel/http_proxy.cc
--  src/core/ext/filters/client_channel/lb_policy.cc
--  src/core/ext/filters/client_channel/lb_policy_registry.cc
--  src/core/ext/filters/client_channel/local_subchannel_pool.cc
--  src/core/ext/filters/client_channel/parse_address.cc
--  src/core/ext/filters/client_channel/proxy_mapper_registry.cc
--  src/core/ext/filters/client_channel/resolver.cc
--  src/core/ext/filters/client_channel/resolver_registry.cc
--  src/core/ext/filters/client_channel/resolver_result_parsing.cc
--  src/core/ext/filters/client_channel/resolving_lb_policy.cc
--  src/core/ext/filters/client_channel/retry_throttle.cc
--  src/core/ext/filters/client_channel/server_address.cc
--  src/core/ext/filters/client_channel/service_config.cc
--  src/core/ext/filters/client_channel/subchannel.cc
--  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
--  src/core/lib/avl/avl.cc
--  src/core/lib/backoff/backoff.cc
--  src/core/lib/channel/channel_args.cc
--  src/core/lib/channel/channel_stack.cc
--  src/core/lib/channel/channel_stack_builder.cc
--  src/core/lib/channel/channel_trace.cc
--  src/core/lib/channel/channelz.cc
--  src/core/lib/channel/channelz_registry.cc
--  src/core/lib/channel/connected_channel.cc
--  src/core/lib/channel/handshaker.cc
--  src/core/lib/channel/handshaker_registry.cc
--  src/core/lib/channel/status_util.cc
--  src/core/lib/compression/compression.cc
--  src/core/lib/compression/compression_args.cc
--  src/core/lib/compression/compression_internal.cc
--  src/core/lib/compression/message_compress.cc
--  src/core/lib/compression/stream_compression.cc
--  src/core/lib/compression/stream_compression_gzip.cc
--  src/core/lib/compression/stream_compression_identity.cc
--  src/core/lib/debug/stats.cc
--  src/core/lib/debug/stats_data.cc
--  src/core/lib/http/format_request.cc
--  src/core/lib/http/httpcli.cc
--  src/core/lib/http/parser.cc
--  src/core/lib/iomgr/buffer_list.cc
--  src/core/lib/iomgr/call_combiner.cc
--  src/core/lib/iomgr/cfstream_handle.cc
--  src/core/lib/iomgr/combiner.cc
--  src/core/lib/iomgr/endpoint.cc
--  src/core/lib/iomgr/endpoint_cfstream.cc
--  src/core/lib/iomgr/endpoint_pair_posix.cc
--  src/core/lib/iomgr/endpoint_pair_uv.cc
--  src/core/lib/iomgr/endpoint_pair_windows.cc
--  src/core/lib/iomgr/error.cc
--  src/core/lib/iomgr/error_cfstream.cc
--  src/core/lib/iomgr/ev_epoll1_linux.cc
--  src/core/lib/iomgr/ev_epollex_linux.cc
--  src/core/lib/iomgr/ev_poll_posix.cc
--  src/core/lib/iomgr/ev_posix.cc
--  src/core/lib/iomgr/ev_windows.cc
--  src/core/lib/iomgr/exec_ctx.cc
--  src/core/lib/iomgr/executor.cc
--  src/core/lib/iomgr/executor/mpmcqueue.cc
--  src/core/lib/iomgr/executor/threadpool.cc
--  src/core/lib/iomgr/fork_posix.cc
--  src/core/lib/iomgr/fork_windows.cc
--  src/core/lib/iomgr/gethostname_fallback.cc
--  src/core/lib/iomgr/gethostname_host_name_max.cc
--  src/core/lib/iomgr/gethostname_sysconf.cc
--  src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
--  src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
--  src/core/lib/iomgr/internal_errqueue.cc
--  src/core/lib/iomgr/iocp_windows.cc
--  src/core/lib/iomgr/iomgr.cc
--  src/core/lib/iomgr/iomgr_custom.cc
--  src/core/lib/iomgr/iomgr_internal.cc
--  src/core/lib/iomgr/iomgr_posix.cc
--  src/core/lib/iomgr/iomgr_posix_cfstream.cc
--  src/core/lib/iomgr/iomgr_uv.cc
--  src/core/lib/iomgr/iomgr_windows.cc
--  src/core/lib/iomgr/is_epollexclusive_available.cc
--  src/core/lib/iomgr/load_file.cc
--  src/core/lib/iomgr/lockfree_event.cc
--  src/core/lib/iomgr/logical_thread.cc
--  src/core/lib/iomgr/polling_entity.cc
--  src/core/lib/iomgr/pollset.cc
--  src/core/lib/iomgr/pollset_custom.cc
--  src/core/lib/iomgr/pollset_set.cc
--  src/core/lib/iomgr/pollset_set_custom.cc
--  src/core/lib/iomgr/pollset_set_windows.cc
--  src/core/lib/iomgr/pollset_uv.cc
--  src/core/lib/iomgr/pollset_windows.cc
--  src/core/lib/iomgr/resolve_address.cc
--  src/core/lib/iomgr/resolve_address_custom.cc
--  src/core/lib/iomgr/resolve_address_posix.cc
--  src/core/lib/iomgr/resolve_address_windows.cc
--  src/core/lib/iomgr/resource_quota.cc
--  src/core/lib/iomgr/sockaddr_utils.cc
--  src/core/lib/iomgr/socket_factory_posix.cc
--  src/core/lib/iomgr/socket_mutator.cc
--  src/core/lib/iomgr/socket_utils_common_posix.cc
--  src/core/lib/iomgr/socket_utils_linux.cc
--  src/core/lib/iomgr/socket_utils_posix.cc
--  src/core/lib/iomgr/socket_utils_uv.cc
--  src/core/lib/iomgr/socket_utils_windows.cc
--  src/core/lib/iomgr/socket_windows.cc
--  src/core/lib/iomgr/tcp_client.cc
--  src/core/lib/iomgr/tcp_client_cfstream.cc
--  src/core/lib/iomgr/tcp_client_custom.cc
--  src/core/lib/iomgr/tcp_client_posix.cc
--  src/core/lib/iomgr/tcp_client_windows.cc
--  src/core/lib/iomgr/tcp_custom.cc
--  src/core/lib/iomgr/tcp_posix.cc
--  src/core/lib/iomgr/tcp_server.cc
--  src/core/lib/iomgr/tcp_server_custom.cc
--  src/core/lib/iomgr/tcp_server_posix.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_common.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
--  src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
--  src/core/lib/iomgr/tcp_server_windows.cc
--  src/core/lib/iomgr/tcp_uv.cc
--  src/core/lib/iomgr/tcp_windows.cc
--  src/core/lib/iomgr/time_averaged_stats.cc
--  src/core/lib/iomgr/timer.cc
--  src/core/lib/iomgr/timer_custom.cc
--  src/core/lib/iomgr/timer_generic.cc
--  src/core/lib/iomgr/timer_heap.cc
--  src/core/lib/iomgr/timer_manager.cc
--  src/core/lib/iomgr/timer_uv.cc
--  src/core/lib/iomgr/udp_server.cc
--  src/core/lib/iomgr/unix_sockets_posix.cc
--  src/core/lib/iomgr/unix_sockets_posix_noop.cc
--  src/core/lib/iomgr/wakeup_fd_eventfd.cc
--  src/core/lib/iomgr/wakeup_fd_nospecial.cc
--  src/core/lib/iomgr/wakeup_fd_pipe.cc
--  src/core/lib/iomgr/wakeup_fd_posix.cc
--  src/core/lib/json/json.cc
--  src/core/lib/json/json_reader.cc
--  src/core/lib/json/json_string.cc
--  src/core/lib/json/json_writer.cc
--  src/core/lib/slice/b64.cc
--  src/core/lib/slice/percent_encoding.cc
--  src/core/lib/slice/slice.cc
--  src/core/lib/slice/slice_buffer.cc
--  src/core/lib/slice/slice_intern.cc
--  src/core/lib/slice/slice_string_helpers.cc
--  src/core/lib/surface/api_trace.cc
--  src/core/lib/surface/byte_buffer.cc
--  src/core/lib/surface/byte_buffer_reader.cc
--  src/core/lib/surface/call.cc
--  src/core/lib/surface/call_details.cc
--  src/core/lib/surface/call_log_batch.cc
--  src/core/lib/surface/channel.cc
--  src/core/lib/surface/channel_init.cc
--  src/core/lib/surface/channel_ping.cc
--  src/core/lib/surface/channel_stack_type.cc
--  src/core/lib/surface/completion_queue.cc
--  src/core/lib/surface/completion_queue_factory.cc
--  src/core/lib/surface/event_string.cc
--  src/core/lib/surface/lame_client.cc
--  src/core/lib/surface/metadata_array.cc
--  src/core/lib/surface/server.cc
--  src/core/lib/surface/validate_metadata.cc
--  src/core/lib/surface/version.cc
--  src/core/lib/transport/bdp_estimator.cc
--  src/core/lib/transport/byte_stream.cc
--  src/core/lib/transport/connectivity_state.cc
--  src/core/lib/transport/error_utils.cc
--  src/core/lib/transport/metadata.cc
--  src/core/lib/transport/metadata_batch.cc
--  src/core/lib/transport/pid_controller.cc
--  src/core/lib/transport/static_metadata.cc
--  src/core/lib/transport/status_conversion.cc
--  src/core/lib/transport/status_metadata.cc
--  src/core/lib/transport/timeout_encoding.cc
--  src/core/lib/transport/transport.cc
--  src/core/lib/transport/transport_op_string.cc
--  src/core/lib/uri/uri_parser.cc
--  src/core/lib/debug/trace.cc
--  src/core/ext/filters/deadline/deadline_filter.cc
-   src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
--  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
--  src/core/ext/upb-generated/gogoproto/gogo.upb.c
--  src/core/ext/upb-generated/validate/validate.upb.c
--  src/core/ext/upb-generated/google/api/annotations.upb.c
--  src/core/ext/upb-generated/google/api/http.upb.c
--  src/core/ext/upb-generated/google/protobuf/any.upb.c
--  src/core/ext/upb-generated/google/protobuf/descriptor.upb.c
--  src/core/ext/upb-generated/google/protobuf/duration.upb.c
--  src/core/ext/upb-generated/google/protobuf/empty.upb.c
--  src/core/ext/upb-generated/google/protobuf/struct.upb.c
--  src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
--  src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
--  src/core/ext/upb-generated/google/rpc/status.upb.c
-   src/cpp/codegen/codegen_init.cc
- )
- 
-diff --git a/Makefile b/Makefile
-index f8bd36f62f6..b25c748d3a9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5695,205 +5695,7 @@ LIBGRPC++_SRC = \
-     src/cpp/util/status.cc \
-     src/cpp/util/string_ref.cc \
-     src/cpp/util/time_cc.cc \
--    src/core/ext/filters/client_channel/backend_metric.cc \
--    src/core/ext/filters/client_channel/backup_poller.cc \
--    src/core/ext/filters/client_channel/channel_connectivity.cc \
--    src/core/ext/filters/client_channel/client_channel.cc \
--    src/core/ext/filters/client_channel/client_channel_channelz.cc \
--    src/core/ext/filters/client_channel/client_channel_factory.cc \
--    src/core/ext/filters/client_channel/client_channel_plugin.cc \
--    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/health/health_check_client.cc \
--    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
--    src/core/ext/filters/client_channel/http_proxy.cc \
--    src/core/ext/filters/client_channel/lb_policy.cc \
--    src/core/ext/filters/client_channel/lb_policy_registry.cc \
--    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/parse_address.cc \
--    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
--    src/core/ext/filters/client_channel/resolver.cc \
--    src/core/ext/filters/client_channel/resolver_registry.cc \
--    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
--    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
--    src/core/ext/filters/client_channel/retry_throttle.cc \
--    src/core/ext/filters/client_channel/server_address.cc \
--    src/core/ext/filters/client_channel/service_config.cc \
--    src/core/ext/filters/client_channel/subchannel.cc \
--    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
--    src/core/lib/avl/avl.cc \
--    src/core/lib/backoff/backoff.cc \
--    src/core/lib/channel/channel_args.cc \
--    src/core/lib/channel/channel_stack.cc \
--    src/core/lib/channel/channel_stack_builder.cc \
--    src/core/lib/channel/channel_trace.cc \
--    src/core/lib/channel/channelz.cc \
--    src/core/lib/channel/channelz_registry.cc \
--    src/core/lib/channel/connected_channel.cc \
--    src/core/lib/channel/handshaker.cc \
--    src/core/lib/channel/handshaker_registry.cc \
--    src/core/lib/channel/status_util.cc \
--    src/core/lib/compression/compression.cc \
--    src/core/lib/compression/compression_args.cc \
--    src/core/lib/compression/compression_internal.cc \
--    src/core/lib/compression/message_compress.cc \
--    src/core/lib/compression/stream_compression.cc \
--    src/core/lib/compression/stream_compression_gzip.cc \
--    src/core/lib/compression/stream_compression_identity.cc \
--    src/core/lib/debug/stats.cc \
--    src/core/lib/debug/stats_data.cc \
--    src/core/lib/http/format_request.cc \
--    src/core/lib/http/httpcli.cc \
--    src/core/lib/http/parser.cc \
--    src/core/lib/iomgr/buffer_list.cc \
--    src/core/lib/iomgr/call_combiner.cc \
--    src/core/lib/iomgr/cfstream_handle.cc \
--    src/core/lib/iomgr/combiner.cc \
--    src/core/lib/iomgr/endpoint.cc \
--    src/core/lib/iomgr/endpoint_cfstream.cc \
--    src/core/lib/iomgr/endpoint_pair_posix.cc \
--    src/core/lib/iomgr/endpoint_pair_uv.cc \
--    src/core/lib/iomgr/endpoint_pair_windows.cc \
--    src/core/lib/iomgr/error.cc \
--    src/core/lib/iomgr/error_cfstream.cc \
--    src/core/lib/iomgr/ev_epoll1_linux.cc \
--    src/core/lib/iomgr/ev_epollex_linux.cc \
--    src/core/lib/iomgr/ev_poll_posix.cc \
--    src/core/lib/iomgr/ev_posix.cc \
--    src/core/lib/iomgr/ev_windows.cc \
--    src/core/lib/iomgr/exec_ctx.cc \
--    src/core/lib/iomgr/executor.cc \
--    src/core/lib/iomgr/executor/mpmcqueue.cc \
--    src/core/lib/iomgr/executor/threadpool.cc \
--    src/core/lib/iomgr/fork_posix.cc \
--    src/core/lib/iomgr/fork_windows.cc \
--    src/core/lib/iomgr/gethostname_fallback.cc \
--    src/core/lib/iomgr/gethostname_host_name_max.cc \
--    src/core/lib/iomgr/gethostname_sysconf.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
--    src/core/lib/iomgr/internal_errqueue.cc \
--    src/core/lib/iomgr/iocp_windows.cc \
--    src/core/lib/iomgr/iomgr.cc \
--    src/core/lib/iomgr/iomgr_custom.cc \
--    src/core/lib/iomgr/iomgr_internal.cc \
--    src/core/lib/iomgr/iomgr_posix.cc \
--    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
--    src/core/lib/iomgr/iomgr_uv.cc \
--    src/core/lib/iomgr/iomgr_windows.cc \
--    src/core/lib/iomgr/is_epollexclusive_available.cc \
--    src/core/lib/iomgr/load_file.cc \
--    src/core/lib/iomgr/lockfree_event.cc \
--    src/core/lib/iomgr/logical_thread.cc \
--    src/core/lib/iomgr/polling_entity.cc \
--    src/core/lib/iomgr/pollset.cc \
--    src/core/lib/iomgr/pollset_custom.cc \
--    src/core/lib/iomgr/pollset_set.cc \
--    src/core/lib/iomgr/pollset_set_custom.cc \
--    src/core/lib/iomgr/pollset_set_windows.cc \
--    src/core/lib/iomgr/pollset_uv.cc \
--    src/core/lib/iomgr/pollset_windows.cc \
--    src/core/lib/iomgr/resolve_address.cc \
--    src/core/lib/iomgr/resolve_address_custom.cc \
--    src/core/lib/iomgr/resolve_address_posix.cc \
--    src/core/lib/iomgr/resolve_address_windows.cc \
--    src/core/lib/iomgr/resource_quota.cc \
--    src/core/lib/iomgr/sockaddr_utils.cc \
--    src/core/lib/iomgr/socket_factory_posix.cc \
--    src/core/lib/iomgr/socket_mutator.cc \
--    src/core/lib/iomgr/socket_utils_common_posix.cc \
--    src/core/lib/iomgr/socket_utils_linux.cc \
--    src/core/lib/iomgr/socket_utils_posix.cc \
--    src/core/lib/iomgr/socket_utils_uv.cc \
--    src/core/lib/iomgr/socket_utils_windows.cc \
--    src/core/lib/iomgr/socket_windows.cc \
--    src/core/lib/iomgr/tcp_client.cc \
--    src/core/lib/iomgr/tcp_client_cfstream.cc \
--    src/core/lib/iomgr/tcp_client_custom.cc \
--    src/core/lib/iomgr/tcp_client_posix.cc \
--    src/core/lib/iomgr/tcp_client_windows.cc \
--    src/core/lib/iomgr/tcp_custom.cc \
--    src/core/lib/iomgr/tcp_posix.cc \
--    src/core/lib/iomgr/tcp_server.cc \
--    src/core/lib/iomgr/tcp_server_custom.cc \
--    src/core/lib/iomgr/tcp_server_posix.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_windows.cc \
--    src/core/lib/iomgr/tcp_uv.cc \
--    src/core/lib/iomgr/tcp_windows.cc \
--    src/core/lib/iomgr/time_averaged_stats.cc \
--    src/core/lib/iomgr/timer.cc \
--    src/core/lib/iomgr/timer_custom.cc \
--    src/core/lib/iomgr/timer_generic.cc \
--    src/core/lib/iomgr/timer_heap.cc \
--    src/core/lib/iomgr/timer_manager.cc \
--    src/core/lib/iomgr/timer_uv.cc \
--    src/core/lib/iomgr/udp_server.cc \
--    src/core/lib/iomgr/unix_sockets_posix.cc \
--    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
--    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
--    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
--    src/core/lib/iomgr/wakeup_fd_pipe.cc \
--    src/core/lib/iomgr/wakeup_fd_posix.cc \
--    src/core/lib/json/json.cc \
--    src/core/lib/json/json_reader.cc \
--    src/core/lib/json/json_string.cc \
--    src/core/lib/json/json_writer.cc \
--    src/core/lib/slice/b64.cc \
--    src/core/lib/slice/percent_encoding.cc \
--    src/core/lib/slice/slice.cc \
--    src/core/lib/slice/slice_buffer.cc \
--    src/core/lib/slice/slice_intern.cc \
--    src/core/lib/slice/slice_string_helpers.cc \
--    src/core/lib/surface/api_trace.cc \
--    src/core/lib/surface/byte_buffer.cc \
--    src/core/lib/surface/byte_buffer_reader.cc \
--    src/core/lib/surface/call.cc \
--    src/core/lib/surface/call_details.cc \
--    src/core/lib/surface/call_log_batch.cc \
--    src/core/lib/surface/channel.cc \
--    src/core/lib/surface/channel_init.cc \
--    src/core/lib/surface/channel_ping.cc \
--    src/core/lib/surface/channel_stack_type.cc \
--    src/core/lib/surface/completion_queue.cc \
--    src/core/lib/surface/completion_queue_factory.cc \
--    src/core/lib/surface/event_string.cc \
--    src/core/lib/surface/lame_client.cc \
--    src/core/lib/surface/metadata_array.cc \
--    src/core/lib/surface/server.cc \
--    src/core/lib/surface/validate_metadata.cc \
--    src/core/lib/surface/version.cc \
--    src/core/lib/transport/bdp_estimator.cc \
--    src/core/lib/transport/byte_stream.cc \
--    src/core/lib/transport/connectivity_state.cc \
--    src/core/lib/transport/error_utils.cc \
--    src/core/lib/transport/metadata.cc \
--    src/core/lib/transport/metadata_batch.cc \
--    src/core/lib/transport/pid_controller.cc \
--    src/core/lib/transport/static_metadata.cc \
--    src/core/lib/transport/status_conversion.cc \
--    src/core/lib/transport/status_metadata.cc \
--    src/core/lib/transport/timeout_encoding.cc \
--    src/core/lib/transport/transport.cc \
--    src/core/lib/transport/transport_op_string.cc \
--    src/core/lib/uri/uri_parser.cc \
--    src/core/lib/debug/trace.cc \
--    src/core/ext/filters/deadline/deadline_filter.cc \
-     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
--    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
--    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
--    src/core/ext/upb-generated/validate/validate.upb.c \
--    src/core/ext/upb-generated/google/api/annotations.upb.c \
--    src/core/ext/upb-generated/google/api/http.upb.c \
--    src/core/ext/upb-generated/google/protobuf/any.upb.c \
--    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
--    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
--    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
--    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
--    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
--    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
--    src/core/ext/upb-generated/google/rpc/status.upb.c \
-     src/cpp/codegen/codegen_init.cc \
- 
- PUBLIC_HEADERS_CXX += \
-@@ -6926,205 +6728,7 @@ LIBGRPC++_UNSECURE_SRC = \
-     src/cpp/util/status.cc \
-     src/cpp/util/string_ref.cc \
-     src/cpp/util/time_cc.cc \
--    src/core/ext/filters/client_channel/backend_metric.cc \
--    src/core/ext/filters/client_channel/backup_poller.cc \
--    src/core/ext/filters/client_channel/channel_connectivity.cc \
--    src/core/ext/filters/client_channel/client_channel.cc \
--    src/core/ext/filters/client_channel/client_channel_channelz.cc \
--    src/core/ext/filters/client_channel/client_channel_factory.cc \
--    src/core/ext/filters/client_channel/client_channel_plugin.cc \
--    src/core/ext/filters/client_channel/global_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/health/health_check_client.cc \
--    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
--    src/core/ext/filters/client_channel/http_proxy.cc \
--    src/core/ext/filters/client_channel/lb_policy.cc \
--    src/core/ext/filters/client_channel/lb_policy_registry.cc \
--    src/core/ext/filters/client_channel/local_subchannel_pool.cc \
--    src/core/ext/filters/client_channel/parse_address.cc \
--    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
--    src/core/ext/filters/client_channel/resolver.cc \
--    src/core/ext/filters/client_channel/resolver_registry.cc \
--    src/core/ext/filters/client_channel/resolver_result_parsing.cc \
--    src/core/ext/filters/client_channel/resolving_lb_policy.cc \
--    src/core/ext/filters/client_channel/retry_throttle.cc \
--    src/core/ext/filters/client_channel/server_address.cc \
--    src/core/ext/filters/client_channel/service_config.cc \
--    src/core/ext/filters/client_channel/subchannel.cc \
--    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
--    src/core/lib/avl/avl.cc \
--    src/core/lib/backoff/backoff.cc \
--    src/core/lib/channel/channel_args.cc \
--    src/core/lib/channel/channel_stack.cc \
--    src/core/lib/channel/channel_stack_builder.cc \
--    src/core/lib/channel/channel_trace.cc \
--    src/core/lib/channel/channelz.cc \
--    src/core/lib/channel/channelz_registry.cc \
--    src/core/lib/channel/connected_channel.cc \
--    src/core/lib/channel/handshaker.cc \
--    src/core/lib/channel/handshaker_registry.cc \
--    src/core/lib/channel/status_util.cc \
--    src/core/lib/compression/compression.cc \
--    src/core/lib/compression/compression_args.cc \
--    src/core/lib/compression/compression_internal.cc \
--    src/core/lib/compression/message_compress.cc \
--    src/core/lib/compression/stream_compression.cc \
--    src/core/lib/compression/stream_compression_gzip.cc \
--    src/core/lib/compression/stream_compression_identity.cc \
--    src/core/lib/debug/stats.cc \
--    src/core/lib/debug/stats_data.cc \
--    src/core/lib/http/format_request.cc \
--    src/core/lib/http/httpcli.cc \
--    src/core/lib/http/parser.cc \
--    src/core/lib/iomgr/buffer_list.cc \
--    src/core/lib/iomgr/call_combiner.cc \
--    src/core/lib/iomgr/cfstream_handle.cc \
--    src/core/lib/iomgr/combiner.cc \
--    src/core/lib/iomgr/endpoint.cc \
--    src/core/lib/iomgr/endpoint_cfstream.cc \
--    src/core/lib/iomgr/endpoint_pair_posix.cc \
--    src/core/lib/iomgr/endpoint_pair_uv.cc \
--    src/core/lib/iomgr/endpoint_pair_windows.cc \
--    src/core/lib/iomgr/error.cc \
--    src/core/lib/iomgr/error_cfstream.cc \
--    src/core/lib/iomgr/ev_epoll1_linux.cc \
--    src/core/lib/iomgr/ev_epollex_linux.cc \
--    src/core/lib/iomgr/ev_poll_posix.cc \
--    src/core/lib/iomgr/ev_posix.cc \
--    src/core/lib/iomgr/ev_windows.cc \
--    src/core/lib/iomgr/exec_ctx.cc \
--    src/core/lib/iomgr/executor.cc \
--    src/core/lib/iomgr/executor/mpmcqueue.cc \
--    src/core/lib/iomgr/executor/threadpool.cc \
--    src/core/lib/iomgr/fork_posix.cc \
--    src/core/lib/iomgr/fork_windows.cc \
--    src/core/lib/iomgr/gethostname_fallback.cc \
--    src/core/lib/iomgr/gethostname_host_name_max.cc \
--    src/core/lib/iomgr/gethostname_sysconf.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
--    src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
--    src/core/lib/iomgr/internal_errqueue.cc \
--    src/core/lib/iomgr/iocp_windows.cc \
--    src/core/lib/iomgr/iomgr.cc \
--    src/core/lib/iomgr/iomgr_custom.cc \
--    src/core/lib/iomgr/iomgr_internal.cc \
--    src/core/lib/iomgr/iomgr_posix.cc \
--    src/core/lib/iomgr/iomgr_posix_cfstream.cc \
--    src/core/lib/iomgr/iomgr_uv.cc \
--    src/core/lib/iomgr/iomgr_windows.cc \
--    src/core/lib/iomgr/is_epollexclusive_available.cc \
--    src/core/lib/iomgr/load_file.cc \
--    src/core/lib/iomgr/lockfree_event.cc \
--    src/core/lib/iomgr/logical_thread.cc \
--    src/core/lib/iomgr/polling_entity.cc \
--    src/core/lib/iomgr/pollset.cc \
--    src/core/lib/iomgr/pollset_custom.cc \
--    src/core/lib/iomgr/pollset_set.cc \
--    src/core/lib/iomgr/pollset_set_custom.cc \
--    src/core/lib/iomgr/pollset_set_windows.cc \
--    src/core/lib/iomgr/pollset_uv.cc \
--    src/core/lib/iomgr/pollset_windows.cc \
--    src/core/lib/iomgr/resolve_address.cc \
--    src/core/lib/iomgr/resolve_address_custom.cc \
--    src/core/lib/iomgr/resolve_address_posix.cc \
--    src/core/lib/iomgr/resolve_address_windows.cc \
--    src/core/lib/iomgr/resource_quota.cc \
--    src/core/lib/iomgr/sockaddr_utils.cc \
--    src/core/lib/iomgr/socket_factory_posix.cc \
--    src/core/lib/iomgr/socket_mutator.cc \
--    src/core/lib/iomgr/socket_utils_common_posix.cc \
--    src/core/lib/iomgr/socket_utils_linux.cc \
--    src/core/lib/iomgr/socket_utils_posix.cc \
--    src/core/lib/iomgr/socket_utils_uv.cc \
--    src/core/lib/iomgr/socket_utils_windows.cc \
--    src/core/lib/iomgr/socket_windows.cc \
--    src/core/lib/iomgr/tcp_client.cc \
--    src/core/lib/iomgr/tcp_client_cfstream.cc \
--    src/core/lib/iomgr/tcp_client_custom.cc \
--    src/core/lib/iomgr/tcp_client_posix.cc \
--    src/core/lib/iomgr/tcp_client_windows.cc \
--    src/core/lib/iomgr/tcp_custom.cc \
--    src/core/lib/iomgr/tcp_posix.cc \
--    src/core/lib/iomgr/tcp_server.cc \
--    src/core/lib/iomgr/tcp_server_custom.cc \
--    src/core/lib/iomgr/tcp_server_posix.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
--    src/core/lib/iomgr/tcp_server_windows.cc \
--    src/core/lib/iomgr/tcp_uv.cc \
--    src/core/lib/iomgr/tcp_windows.cc \
--    src/core/lib/iomgr/time_averaged_stats.cc \
--    src/core/lib/iomgr/timer.cc \
--    src/core/lib/iomgr/timer_custom.cc \
--    src/core/lib/iomgr/timer_generic.cc \
--    src/core/lib/iomgr/timer_heap.cc \
--    src/core/lib/iomgr/timer_manager.cc \
--    src/core/lib/iomgr/timer_uv.cc \
--    src/core/lib/iomgr/udp_server.cc \
--    src/core/lib/iomgr/unix_sockets_posix.cc \
--    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
--    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
--    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
--    src/core/lib/iomgr/wakeup_fd_pipe.cc \
--    src/core/lib/iomgr/wakeup_fd_posix.cc \
--    src/core/lib/json/json.cc \
--    src/core/lib/json/json_reader.cc \
--    src/core/lib/json/json_string.cc \
--    src/core/lib/json/json_writer.cc \
--    src/core/lib/slice/b64.cc \
--    src/core/lib/slice/percent_encoding.cc \
--    src/core/lib/slice/slice.cc \
--    src/core/lib/slice/slice_buffer.cc \
--    src/core/lib/slice/slice_intern.cc \
--    src/core/lib/slice/slice_string_helpers.cc \
--    src/core/lib/surface/api_trace.cc \
--    src/core/lib/surface/byte_buffer.cc \
--    src/core/lib/surface/byte_buffer_reader.cc \
--    src/core/lib/surface/call.cc \
--    src/core/lib/surface/call_details.cc \
--    src/core/lib/surface/call_log_batch.cc \
--    src/core/lib/surface/channel.cc \
--    src/core/lib/surface/channel_init.cc \
--    src/core/lib/surface/channel_ping.cc \
--    src/core/lib/surface/channel_stack_type.cc \
--    src/core/lib/surface/completion_queue.cc \
--    src/core/lib/surface/completion_queue_factory.cc \
--    src/core/lib/surface/event_string.cc \
--    src/core/lib/surface/lame_client.cc \
--    src/core/lib/surface/metadata_array.cc \
--    src/core/lib/surface/server.cc \
--    src/core/lib/surface/validate_metadata.cc \
--    src/core/lib/surface/version.cc \
--    src/core/lib/transport/bdp_estimator.cc \
--    src/core/lib/transport/byte_stream.cc \
--    src/core/lib/transport/connectivity_state.cc \
--    src/core/lib/transport/error_utils.cc \
--    src/core/lib/transport/metadata.cc \
--    src/core/lib/transport/metadata_batch.cc \
--    src/core/lib/transport/pid_controller.cc \
--    src/core/lib/transport/static_metadata.cc \
--    src/core/lib/transport/status_conversion.cc \
--    src/core/lib/transport/status_metadata.cc \
--    src/core/lib/transport/timeout_encoding.cc \
--    src/core/lib/transport/transport.cc \
--    src/core/lib/transport/transport_op_string.cc \
--    src/core/lib/uri/uri_parser.cc \
--    src/core/lib/debug/trace.cc \
--    src/core/ext/filters/deadline/deadline_filter.cc \
-     src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
--    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
--    src/core/ext/upb-generated/gogoproto/gogo.upb.c \
--    src/core/ext/upb-generated/validate/validate.upb.c \
--    src/core/ext/upb-generated/google/api/annotations.upb.c \
--    src/core/ext/upb-generated/google/api/http.upb.c \
--    src/core/ext/upb-generated/google/protobuf/any.upb.c \
--    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
--    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
--    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
--    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
--    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
--    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
--    src/core/ext/upb-generated/google/rpc/status.upb.c \
-     src/cpp/codegen/codegen_init.cc \
- 
- PUBLIC_HEADERS_CXX += \
-diff --git a/build.yaml b/build.yaml
-index 003ff5038de..214fbc619de 100644
---- a/build.yaml
-+++ b/build.yaml
-@@ -601,7 +601,6 @@ filegroups:
-   uses:
-   - gpr_base_headers
-   - grpc_base_headers
--  - grpc_client_channel
-   - grpc_health_upb
-   - grpc_transport_inproc_headers
-   - grpc++_codegen_base
-diff --git a/grpc.gyp b/grpc.gyp
-index 1dbb8e61295..7e2e0ead0a4 100644
---- a/grpc.gyp
-+++ b/grpc.gyp
-@@ -1547,205 +1547,7 @@
-         'src/cpp/util/status.cc',
-         'src/cpp/util/string_ref.cc',
-         'src/cpp/util/time_cc.cc',
--        'src/core/ext/filters/client_channel/backend_metric.cc',
--        'src/core/ext/filters/client_channel/backup_poller.cc',
--        'src/core/ext/filters/client_channel/channel_connectivity.cc',
--        'src/core/ext/filters/client_channel/client_channel.cc',
--        'src/core/ext/filters/client_channel/client_channel_channelz.cc',
--        'src/core/ext/filters/client_channel/client_channel_factory.cc',
--        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
--        'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
--        'src/core/ext/filters/client_channel/health/health_check_client.cc',
--        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
--        'src/core/ext/filters/client_channel/http_proxy.cc',
--        'src/core/ext/filters/client_channel/lb_policy.cc',
--        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
--        'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
--        'src/core/ext/filters/client_channel/parse_address.cc',
--        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
--        'src/core/ext/filters/client_channel/resolver.cc',
--        'src/core/ext/filters/client_channel/resolver_registry.cc',
--        'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
--        'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
--        'src/core/ext/filters/client_channel/retry_throttle.cc',
--        'src/core/ext/filters/client_channel/server_address.cc',
--        'src/core/ext/filters/client_channel/service_config.cc',
--        'src/core/ext/filters/client_channel/subchannel.cc',
--        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
--        'src/core/lib/avl/avl.cc',
--        'src/core/lib/backoff/backoff.cc',
--        'src/core/lib/channel/channel_args.cc',
--        'src/core/lib/channel/channel_stack.cc',
--        'src/core/lib/channel/channel_stack_builder.cc',
--        'src/core/lib/channel/channel_trace.cc',
--        'src/core/lib/channel/channelz.cc',
--        'src/core/lib/channel/channelz_registry.cc',
--        'src/core/lib/channel/connected_channel.cc',
--        'src/core/lib/channel/handshaker.cc',
--        'src/core/lib/channel/handshaker_registry.cc',
--        'src/core/lib/channel/status_util.cc',
--        'src/core/lib/compression/compression.cc',
--        'src/core/lib/compression/compression_args.cc',
--        'src/core/lib/compression/compression_internal.cc',
--        'src/core/lib/compression/message_compress.cc',
--        'src/core/lib/compression/stream_compression.cc',
--        'src/core/lib/compression/stream_compression_gzip.cc',
--        'src/core/lib/compression/stream_compression_identity.cc',
--        'src/core/lib/debug/stats.cc',
--        'src/core/lib/debug/stats_data.cc',
--        'src/core/lib/http/format_request.cc',
--        'src/core/lib/http/httpcli.cc',
--        'src/core/lib/http/parser.cc',
--        'src/core/lib/iomgr/buffer_list.cc',
--        'src/core/lib/iomgr/call_combiner.cc',
--        'src/core/lib/iomgr/cfstream_handle.cc',
--        'src/core/lib/iomgr/combiner.cc',
--        'src/core/lib/iomgr/endpoint.cc',
--        'src/core/lib/iomgr/endpoint_cfstream.cc',
--        'src/core/lib/iomgr/endpoint_pair_posix.cc',
--        'src/core/lib/iomgr/endpoint_pair_uv.cc',
--        'src/core/lib/iomgr/endpoint_pair_windows.cc',
--        'src/core/lib/iomgr/error.cc',
--        'src/core/lib/iomgr/error_cfstream.cc',
--        'src/core/lib/iomgr/ev_epoll1_linux.cc',
--        'src/core/lib/iomgr/ev_epollex_linux.cc',
--        'src/core/lib/iomgr/ev_poll_posix.cc',
--        'src/core/lib/iomgr/ev_posix.cc',
--        'src/core/lib/iomgr/ev_windows.cc',
--        'src/core/lib/iomgr/exec_ctx.cc',
--        'src/core/lib/iomgr/executor.cc',
--        'src/core/lib/iomgr/executor/mpmcqueue.cc',
--        'src/core/lib/iomgr/executor/threadpool.cc',
--        'src/core/lib/iomgr/fork_posix.cc',
--        'src/core/lib/iomgr/fork_windows.cc',
--        'src/core/lib/iomgr/gethostname_fallback.cc',
--        'src/core/lib/iomgr/gethostname_host_name_max.cc',
--        'src/core/lib/iomgr/gethostname_sysconf.cc',
--        'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc',
--        'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc',
--        'src/core/lib/iomgr/internal_errqueue.cc',
--        'src/core/lib/iomgr/iocp_windows.cc',
--        'src/core/lib/iomgr/iomgr.cc',
--        'src/core/lib/iomgr/iomgr_custom.cc',
--        'src/core/lib/iomgr/iomgr_internal.cc',
--        'src/core/lib/iomgr/iomgr_posix.cc',
--        'src/core/lib/iomgr/iomgr_posix_cfstream.cc',
--        'src/core/lib/iomgr/iomgr_uv.cc',
--        'src/core/lib/iomgr/iomgr_windows.cc',
--        'src/core/lib/iomgr/is_epollexclusive_available.cc',
--        'src/core/lib/iomgr/load_file.cc',
--        'src/core/lib/iomgr/lockfree_event.cc',
--        'src/core/lib/iomgr/logical_thread.cc',
--        'src/core/lib/iomgr/polling_entity.cc',
--        'src/core/lib/iomgr/pollset.cc',
--        'src/core/lib/iomgr/pollset_custom.cc',
--        'src/core/lib/iomgr/pollset_set.cc',
--        'src/core/lib/iomgr/pollset_set_custom.cc',
--        'src/core/lib/iomgr/pollset_set_windows.cc',
--        'src/core/lib/iomgr/pollset_uv.cc',
--        'src/core/lib/iomgr/pollset_windows.cc',
--        'src/core/lib/iomgr/resolve_address.cc',
--        'src/core/lib/iomgr/resolve_address_custom.cc',
--        'src/core/lib/iomgr/resolve_address_posix.cc',
--        'src/core/lib/iomgr/resolve_address_windows.cc',
--        'src/core/lib/iomgr/resource_quota.cc',
--        'src/core/lib/iomgr/sockaddr_utils.cc',
--        'src/core/lib/iomgr/socket_factory_posix.cc',
--        'src/core/lib/iomgr/socket_mutator.cc',
--        'src/core/lib/iomgr/socket_utils_common_posix.cc',
--        'src/core/lib/iomgr/socket_utils_linux.cc',
--        'src/core/lib/iomgr/socket_utils_posix.cc',
--        'src/core/lib/iomgr/socket_utils_uv.cc',
--        'src/core/lib/iomgr/socket_utils_windows.cc',
--        'src/core/lib/iomgr/socket_windows.cc',
--        'src/core/lib/iomgr/tcp_client.cc',
--        'src/core/lib/iomgr/tcp_client_cfstream.cc',
--        'src/core/lib/iomgr/tcp_client_custom.cc',
--        'src/core/lib/iomgr/tcp_client_posix.cc',
--        'src/core/lib/iomgr/tcp_client_windows.cc',
--        'src/core/lib/iomgr/tcp_custom.cc',
--        'src/core/lib/iomgr/tcp_posix.cc',
--        'src/core/lib/iomgr/tcp_server.cc',
--        'src/core/lib/iomgr/tcp_server_custom.cc',
--        'src/core/lib/iomgr/tcp_server_posix.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_common.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc',
--        'src/core/lib/iomgr/tcp_server_windows.cc',
--        'src/core/lib/iomgr/tcp_uv.cc',
--        'src/core/lib/iomgr/tcp_windows.cc',
--        'src/core/lib/iomgr/time_averaged_stats.cc',
--        'src/core/lib/iomgr/timer.cc',
--        'src/core/lib/iomgr/timer_custom.cc',
--        'src/core/lib/iomgr/timer_generic.cc',
--        'src/core/lib/iomgr/timer_heap.cc',
--        'src/core/lib/iomgr/timer_manager.cc',
--        'src/core/lib/iomgr/timer_uv.cc',
--        'src/core/lib/iomgr/udp_server.cc',
--        'src/core/lib/iomgr/unix_sockets_posix.cc',
--        'src/core/lib/iomgr/unix_sockets_posix_noop.cc',
--        'src/core/lib/iomgr/wakeup_fd_eventfd.cc',
--        'src/core/lib/iomgr/wakeup_fd_nospecial.cc',
--        'src/core/lib/iomgr/wakeup_fd_pipe.cc',
--        'src/core/lib/iomgr/wakeup_fd_posix.cc',
--        'src/core/lib/json/json.cc',
--        'src/core/lib/json/json_reader.cc',
--        'src/core/lib/json/json_string.cc',
--        'src/core/lib/json/json_writer.cc',
--        'src/core/lib/slice/b64.cc',
--        'src/core/lib/slice/percent_encoding.cc',
--        'src/core/lib/slice/slice.cc',
--        'src/core/lib/slice/slice_buffer.cc',
--        'src/core/lib/slice/slice_intern.cc',
--        'src/core/lib/slice/slice_string_helpers.cc',
--        'src/core/lib/surface/api_trace.cc',
--        'src/core/lib/surface/byte_buffer.cc',
--        'src/core/lib/surface/byte_buffer_reader.cc',
--        'src/core/lib/surface/call.cc',
--        'src/core/lib/surface/call_details.cc',
--        'src/core/lib/surface/call_log_batch.cc',
--        'src/core/lib/surface/channel.cc',
--        'src/core/lib/surface/channel_init.cc',
--        'src/core/lib/surface/channel_ping.cc',
--        'src/core/lib/surface/channel_stack_type.cc',
--        'src/core/lib/surface/completion_queue.cc',
--        'src/core/lib/surface/completion_queue_factory.cc',
--        'src/core/lib/surface/event_string.cc',
--        'src/core/lib/surface/lame_client.cc',
--        'src/core/lib/surface/metadata_array.cc',
--        'src/core/lib/surface/server.cc',
--        'src/core/lib/surface/validate_metadata.cc',
--        'src/core/lib/surface/version.cc',
--        'src/core/lib/transport/bdp_estimator.cc',
--        'src/core/lib/transport/byte_stream.cc',
--        'src/core/lib/transport/connectivity_state.cc',
--        'src/core/lib/transport/error_utils.cc',
--        'src/core/lib/transport/metadata.cc',
--        'src/core/lib/transport/metadata_batch.cc',
--        'src/core/lib/transport/pid_controller.cc',
--        'src/core/lib/transport/static_metadata.cc',
--        'src/core/lib/transport/status_conversion.cc',
--        'src/core/lib/transport/status_metadata.cc',
--        'src/core/lib/transport/timeout_encoding.cc',
--        'src/core/lib/transport/transport.cc',
--        'src/core/lib/transport/transport_op_string.cc',
--        'src/core/lib/uri/uri_parser.cc',
--        'src/core/lib/debug/trace.cc',
--        'src/core/ext/filters/deadline/deadline_filter.cc',
-         'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
--        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
--        'src/core/ext/upb-generated/gogoproto/gogo.upb.c',
--        'src/core/ext/upb-generated/validate/validate.upb.c',
--        'src/core/ext/upb-generated/google/api/annotations.upb.c',
--        'src/core/ext/upb-generated/google/api/http.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
--        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-         'src/cpp/codegen/codegen_init.cc',
-       ],
-     },
-@@ -1901,205 +1703,7 @@
-         'src/cpp/util/status.cc',
-         'src/cpp/util/string_ref.cc',
-         'src/cpp/util/time_cc.cc',
--        'src/core/ext/filters/client_channel/backend_metric.cc',
--        'src/core/ext/filters/client_channel/backup_poller.cc',
--        'src/core/ext/filters/client_channel/channel_connectivity.cc',
--        'src/core/ext/filters/client_channel/client_channel.cc',
--        'src/core/ext/filters/client_channel/client_channel_channelz.cc',
--        'src/core/ext/filters/client_channel/client_channel_factory.cc',
--        'src/core/ext/filters/client_channel/client_channel_plugin.cc',
--        'src/core/ext/filters/client_channel/global_subchannel_pool.cc',
--        'src/core/ext/filters/client_channel/health/health_check_client.cc',
--        'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
--        'src/core/ext/filters/client_channel/http_proxy.cc',
--        'src/core/ext/filters/client_channel/lb_policy.cc',
--        'src/core/ext/filters/client_channel/lb_policy_registry.cc',
--        'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
--        'src/core/ext/filters/client_channel/parse_address.cc',
--        'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
--        'src/core/ext/filters/client_channel/resolver.cc',
--        'src/core/ext/filters/client_channel/resolver_registry.cc',
--        'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
--        'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
--        'src/core/ext/filters/client_channel/retry_throttle.cc',
--        'src/core/ext/filters/client_channel/server_address.cc',
--        'src/core/ext/filters/client_channel/service_config.cc',
--        'src/core/ext/filters/client_channel/subchannel.cc',
--        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
--        'src/core/lib/avl/avl.cc',
--        'src/core/lib/backoff/backoff.cc',
--        'src/core/lib/channel/channel_args.cc',
--        'src/core/lib/channel/channel_stack.cc',
--        'src/core/lib/channel/channel_stack_builder.cc',
--        'src/core/lib/channel/channel_trace.cc',
--        'src/core/lib/channel/channelz.cc',
--        'src/core/lib/channel/channelz_registry.cc',
--        'src/core/lib/channel/connected_channel.cc',
--        'src/core/lib/channel/handshaker.cc',
--        'src/core/lib/channel/handshaker_registry.cc',
--        'src/core/lib/channel/status_util.cc',
--        'src/core/lib/compression/compression.cc',
--        'src/core/lib/compression/compression_args.cc',
--        'src/core/lib/compression/compression_internal.cc',
--        'src/core/lib/compression/message_compress.cc',
--        'src/core/lib/compression/stream_compression.cc',
--        'src/core/lib/compression/stream_compression_gzip.cc',
--        'src/core/lib/compression/stream_compression_identity.cc',
--        'src/core/lib/debug/stats.cc',
--        'src/core/lib/debug/stats_data.cc',
--        'src/core/lib/http/format_request.cc',
--        'src/core/lib/http/httpcli.cc',
--        'src/core/lib/http/parser.cc',
--        'src/core/lib/iomgr/buffer_list.cc',
--        'src/core/lib/iomgr/call_combiner.cc',
--        'src/core/lib/iomgr/cfstream_handle.cc',
--        'src/core/lib/iomgr/combiner.cc',
--        'src/core/lib/iomgr/endpoint.cc',
--        'src/core/lib/iomgr/endpoint_cfstream.cc',
--        'src/core/lib/iomgr/endpoint_pair_posix.cc',
--        'src/core/lib/iomgr/endpoint_pair_uv.cc',
--        'src/core/lib/iomgr/endpoint_pair_windows.cc',
--        'src/core/lib/iomgr/error.cc',
--        'src/core/lib/iomgr/error_cfstream.cc',
--        'src/core/lib/iomgr/ev_epoll1_linux.cc',
--        'src/core/lib/iomgr/ev_epollex_linux.cc',
--        'src/core/lib/iomgr/ev_poll_posix.cc',
--        'src/core/lib/iomgr/ev_posix.cc',
--        'src/core/lib/iomgr/ev_windows.cc',
--        'src/core/lib/iomgr/exec_ctx.cc',
--        'src/core/lib/iomgr/executor.cc',
--        'src/core/lib/iomgr/executor/mpmcqueue.cc',
--        'src/core/lib/iomgr/executor/threadpool.cc',
--        'src/core/lib/iomgr/fork_posix.cc',
--        'src/core/lib/iomgr/fork_windows.cc',
--        'src/core/lib/iomgr/gethostname_fallback.cc',
--        'src/core/lib/iomgr/gethostname_host_name_max.cc',
--        'src/core/lib/iomgr/gethostname_sysconf.cc',
--        'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc',
--        'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc',
--        'src/core/lib/iomgr/internal_errqueue.cc',
--        'src/core/lib/iomgr/iocp_windows.cc',
--        'src/core/lib/iomgr/iomgr.cc',
--        'src/core/lib/iomgr/iomgr_custom.cc',
--        'src/core/lib/iomgr/iomgr_internal.cc',
--        'src/core/lib/iomgr/iomgr_posix.cc',
--        'src/core/lib/iomgr/iomgr_posix_cfstream.cc',
--        'src/core/lib/iomgr/iomgr_uv.cc',
--        'src/core/lib/iomgr/iomgr_windows.cc',
--        'src/core/lib/iomgr/is_epollexclusive_available.cc',
--        'src/core/lib/iomgr/load_file.cc',
--        'src/core/lib/iomgr/lockfree_event.cc',
--        'src/core/lib/iomgr/logical_thread.cc',
--        'src/core/lib/iomgr/polling_entity.cc',
--        'src/core/lib/iomgr/pollset.cc',
--        'src/core/lib/iomgr/pollset_custom.cc',
--        'src/core/lib/iomgr/pollset_set.cc',
--        'src/core/lib/iomgr/pollset_set_custom.cc',
--        'src/core/lib/iomgr/pollset_set_windows.cc',
--        'src/core/lib/iomgr/pollset_uv.cc',
--        'src/core/lib/iomgr/pollset_windows.cc',
--        'src/core/lib/iomgr/resolve_address.cc',
--        'src/core/lib/iomgr/resolve_address_custom.cc',
--        'src/core/lib/iomgr/resolve_address_posix.cc',
--        'src/core/lib/iomgr/resolve_address_windows.cc',
--        'src/core/lib/iomgr/resource_quota.cc',
--        'src/core/lib/iomgr/sockaddr_utils.cc',
--        'src/core/lib/iomgr/socket_factory_posix.cc',
--        'src/core/lib/iomgr/socket_mutator.cc',
--        'src/core/lib/iomgr/socket_utils_common_posix.cc',
--        'src/core/lib/iomgr/socket_utils_linux.cc',
--        'src/core/lib/iomgr/socket_utils_posix.cc',
--        'src/core/lib/iomgr/socket_utils_uv.cc',
--        'src/core/lib/iomgr/socket_utils_windows.cc',
--        'src/core/lib/iomgr/socket_windows.cc',
--        'src/core/lib/iomgr/tcp_client.cc',
--        'src/core/lib/iomgr/tcp_client_cfstream.cc',
--        'src/core/lib/iomgr/tcp_client_custom.cc',
--        'src/core/lib/iomgr/tcp_client_posix.cc',
--        'src/core/lib/iomgr/tcp_client_windows.cc',
--        'src/core/lib/iomgr/tcp_custom.cc',
--        'src/core/lib/iomgr/tcp_posix.cc',
--        'src/core/lib/iomgr/tcp_server.cc',
--        'src/core/lib/iomgr/tcp_server_custom.cc',
--        'src/core/lib/iomgr/tcp_server_posix.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_common.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc',
--        'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc',
--        'src/core/lib/iomgr/tcp_server_windows.cc',
--        'src/core/lib/iomgr/tcp_uv.cc',
--        'src/core/lib/iomgr/tcp_windows.cc',
--        'src/core/lib/iomgr/time_averaged_stats.cc',
--        'src/core/lib/iomgr/timer.cc',
--        'src/core/lib/iomgr/timer_custom.cc',
--        'src/core/lib/iomgr/timer_generic.cc',
--        'src/core/lib/iomgr/timer_heap.cc',
--        'src/core/lib/iomgr/timer_manager.cc',
--        'src/core/lib/iomgr/timer_uv.cc',
--        'src/core/lib/iomgr/udp_server.cc',
--        'src/core/lib/iomgr/unix_sockets_posix.cc',
--        'src/core/lib/iomgr/unix_sockets_posix_noop.cc',
--        'src/core/lib/iomgr/wakeup_fd_eventfd.cc',
--        'src/core/lib/iomgr/wakeup_fd_nospecial.cc',
--        'src/core/lib/iomgr/wakeup_fd_pipe.cc',
--        'src/core/lib/iomgr/wakeup_fd_posix.cc',
--        'src/core/lib/json/json.cc',
--        'src/core/lib/json/json_reader.cc',
--        'src/core/lib/json/json_string.cc',
--        'src/core/lib/json/json_writer.cc',
--        'src/core/lib/slice/b64.cc',
--        'src/core/lib/slice/percent_encoding.cc',
--        'src/core/lib/slice/slice.cc',
--        'src/core/lib/slice/slice_buffer.cc',
--        'src/core/lib/slice/slice_intern.cc',
--        'src/core/lib/slice/slice_string_helpers.cc',
--        'src/core/lib/surface/api_trace.cc',
--        'src/core/lib/surface/byte_buffer.cc',
--        'src/core/lib/surface/byte_buffer_reader.cc',
--        'src/core/lib/surface/call.cc',
--        'src/core/lib/surface/call_details.cc',
--        'src/core/lib/surface/call_log_batch.cc',
--        'src/core/lib/surface/channel.cc',
--        'src/core/lib/surface/channel_init.cc',
--        'src/core/lib/surface/channel_ping.cc',
--        'src/core/lib/surface/channel_stack_type.cc',
--        'src/core/lib/surface/completion_queue.cc',
--        'src/core/lib/surface/completion_queue_factory.cc',
--        'src/core/lib/surface/event_string.cc',
--        'src/core/lib/surface/lame_client.cc',
--        'src/core/lib/surface/metadata_array.cc',
--        'src/core/lib/surface/server.cc',
--        'src/core/lib/surface/validate_metadata.cc',
--        'src/core/lib/surface/version.cc',
--        'src/core/lib/transport/bdp_estimator.cc',
--        'src/core/lib/transport/byte_stream.cc',
--        'src/core/lib/transport/connectivity_state.cc',
--        'src/core/lib/transport/error_utils.cc',
--        'src/core/lib/transport/metadata.cc',
--        'src/core/lib/transport/metadata_batch.cc',
--        'src/core/lib/transport/pid_controller.cc',
--        'src/core/lib/transport/static_metadata.cc',
--        'src/core/lib/transport/status_conversion.cc',
--        'src/core/lib/transport/status_metadata.cc',
--        'src/core/lib/transport/timeout_encoding.cc',
--        'src/core/lib/transport/transport.cc',
--        'src/core/lib/transport/transport_op_string.cc',
--        'src/core/lib/uri/uri_parser.cc',
--        'src/core/lib/debug/trace.cc',
--        'src/core/ext/filters/deadline/deadline_filter.cc',
-         'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
--        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
--        'src/core/ext/upb-generated/gogoproto/gogo.upb.c',
--        'src/core/ext/upb-generated/validate/validate.upb.c',
--        'src/core/ext/upb-generated/google/api/annotations.upb.c',
--        'src/core/ext/upb-generated/google/api/http.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
--        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
--        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-         'src/cpp/codegen/codegen_init.cc',
-       ],
-     },
-diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
-index dc84a6f3fd7..f3c1bad6b7a 100644
---- a/tools/doxygen/Doxyfile.c++.internal
-+++ b/tools/doxygen/Doxyfile.c++.internal
-@@ -1063,135 +1063,32 @@ include/grpcpp/support/sync_stream.h \
- include/grpcpp/support/sync_stream_impl.h \
- include/grpcpp/support/time.h \
- include/grpcpp/support/validate_service_config.h \
--src/core/ext/filters/client_channel/backend_metric.cc \
--src/core/ext/filters/client_channel/backend_metric.h \
--src/core/ext/filters/client_channel/backup_poller.cc \
--src/core/ext/filters/client_channel/backup_poller.h \
--src/core/ext/filters/client_channel/channel_connectivity.cc \
--src/core/ext/filters/client_channel/client_channel.cc \
--src/core/ext/filters/client_channel/client_channel.h \
--src/core/ext/filters/client_channel/client_channel_channelz.cc \
--src/core/ext/filters/client_channel/client_channel_channelz.h \
--src/core/ext/filters/client_channel/client_channel_factory.cc \
--src/core/ext/filters/client_channel/client_channel_factory.h \
--src/core/ext/filters/client_channel/client_channel_plugin.cc \
--src/core/ext/filters/client_channel/connector.h \
--src/core/ext/filters/client_channel/global_subchannel_pool.cc \
--src/core/ext/filters/client_channel/global_subchannel_pool.h \
--src/core/ext/filters/client_channel/health/health_check_client.cc \
--src/core/ext/filters/client_channel/health/health_check_client.h \
--src/core/ext/filters/client_channel/http_connect_handshaker.cc \
--src/core/ext/filters/client_channel/http_connect_handshaker.h \
--src/core/ext/filters/client_channel/http_proxy.cc \
--src/core/ext/filters/client_channel/http_proxy.h \
--src/core/ext/filters/client_channel/lb_policy.cc \
--src/core/ext/filters/client_channel/lb_policy.h \
--src/core/ext/filters/client_channel/lb_policy_factory.h \
--src/core/ext/filters/client_channel/lb_policy_registry.cc \
--src/core/ext/filters/client_channel/lb_policy_registry.h \
--src/core/ext/filters/client_channel/local_subchannel_pool.cc \
--src/core/ext/filters/client_channel/local_subchannel_pool.h \
--src/core/ext/filters/client_channel/parse_address.cc \
--src/core/ext/filters/client_channel/parse_address.h \
--src/core/ext/filters/client_channel/proxy_mapper.h \
--src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
--src/core/ext/filters/client_channel/proxy_mapper_registry.h \
--src/core/ext/filters/client_channel/resolver.cc \
--src/core/ext/filters/client_channel/resolver.h \
--src/core/ext/filters/client_channel/resolver_factory.h \
--src/core/ext/filters/client_channel/resolver_registry.cc \
--src/core/ext/filters/client_channel/resolver_registry.h \
--src/core/ext/filters/client_channel/resolver_result_parsing.cc \
--src/core/ext/filters/client_channel/resolver_result_parsing.h \
--src/core/ext/filters/client_channel/resolving_lb_policy.cc \
--src/core/ext/filters/client_channel/resolving_lb_policy.h \
--src/core/ext/filters/client_channel/retry_throttle.cc \
--src/core/ext/filters/client_channel/retry_throttle.h \
--src/core/ext/filters/client_channel/server_address.cc \
--src/core/ext/filters/client_channel/server_address.h \
--src/core/ext/filters/client_channel/service_config.cc \
--src/core/ext/filters/client_channel/service_config.h \
--src/core/ext/filters/client_channel/subchannel.cc \
--src/core/ext/filters/client_channel/subchannel.h \
--src/core/ext/filters/client_channel/subchannel_interface.h \
--src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
--src/core/ext/filters/client_channel/subchannel_pool_interface.h \
--src/core/ext/filters/deadline/deadline_filter.cc \
--src/core/ext/filters/deadline/deadline_filter.h \
- src/core/ext/transport/inproc/inproc_transport.h \
--src/core/ext/upb-generated/gogoproto/gogo.upb.c \
--src/core/ext/upb-generated/gogoproto/gogo.upb.h \
--src/core/ext/upb-generated/google/api/annotations.upb.c \
--src/core/ext/upb-generated/google/api/annotations.upb.h \
--src/core/ext/upb-generated/google/api/http.upb.c \
--src/core/ext/upb-generated/google/api/http.upb.h \
--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 \
--src/core/ext/upb-generated/google/protobuf/empty.upb.h \
--src/core/ext/upb-generated/google/protobuf/struct.upb.c \
--src/core/ext/upb-generated/google/protobuf/struct.upb.h \
--src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
--src/core/ext/upb-generated/google/protobuf/timestamp.upb.h \
--src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
--src/core/ext/upb-generated/google/protobuf/wrappers.upb.h \
--src/core/ext/upb-generated/google/rpc/status.upb.c \
--src/core/ext/upb-generated/google/rpc/status.upb.h \
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.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/lib/avl/avl.cc \
- src/core/lib/avl/avl.h \
--src/core/lib/backoff/backoff.cc \
- src/core/lib/backoff/backoff.h \
--src/core/lib/channel/channel_args.cc \
- src/core/lib/channel/channel_args.h \
--src/core/lib/channel/channel_stack.cc \
- src/core/lib/channel/channel_stack.h \
--src/core/lib/channel/channel_stack_builder.cc \
- src/core/lib/channel/channel_stack_builder.h \
--src/core/lib/channel/channel_trace.cc \
- src/core/lib/channel/channel_trace.h \
--src/core/lib/channel/channelz.cc \
- src/core/lib/channel/channelz.h \
--src/core/lib/channel/channelz_registry.cc \
- src/core/lib/channel/channelz_registry.h \
--src/core/lib/channel/connected_channel.cc \
- src/core/lib/channel/connected_channel.h \
- src/core/lib/channel/context.h \
--src/core/lib/channel/handshaker.cc \
- src/core/lib/channel/handshaker.h \
- src/core/lib/channel/handshaker_factory.h \
--src/core/lib/channel/handshaker_registry.cc \
- src/core/lib/channel/handshaker_registry.h \
--src/core/lib/channel/status_util.cc \
- src/core/lib/channel/status_util.h \
- src/core/lib/compression/algorithm_metadata.h \
--src/core/lib/compression/compression.cc \
--src/core/lib/compression/compression_args.cc \
- src/core/lib/compression/compression_args.h \
--src/core/lib/compression/compression_internal.cc \
- src/core/lib/compression/compression_internal.h \
--src/core/lib/compression/message_compress.cc \
- src/core/lib/compression/message_compress.h \
--src/core/lib/compression/stream_compression.cc \
- src/core/lib/compression/stream_compression.h \
--src/core/lib/compression/stream_compression_gzip.cc \
- src/core/lib/compression/stream_compression_gzip.h \
--src/core/lib/compression/stream_compression_identity.cc \
- src/core/lib/compression/stream_compression_identity.h \
--src/core/lib/debug/stats.cc \
- src/core/lib/debug/stats.h \
--src/core/lib/debug/stats_data.cc \
- src/core/lib/debug/stats_data.h \
--src/core/lib/debug/trace.cc \
- src/core/lib/debug/trace.h \
- src/core/lib/gpr/alloc.h \
- src/core/lib/gpr/arena.h \
-@@ -1228,257 +1125,120 @@ src/core/lib/gprpp/ref_counted_ptr.h \
- src/core/lib/gprpp/string_view.h \
- src/core/lib/gprpp/sync.h \
- src/core/lib/gprpp/thd.h \
--src/core/lib/http/format_request.cc \
- src/core/lib/http/format_request.h \
--src/core/lib/http/httpcli.cc \
- src/core/lib/http/httpcli.h \
--src/core/lib/http/parser.cc \
- src/core/lib/http/parser.h \
- src/core/lib/iomgr/block_annotate.h \
--src/core/lib/iomgr/buffer_list.cc \
- src/core/lib/iomgr/buffer_list.h \
--src/core/lib/iomgr/call_combiner.cc \
- src/core/lib/iomgr/call_combiner.h \
--src/core/lib/iomgr/cfstream_handle.cc \
- src/core/lib/iomgr/cfstream_handle.h \
- src/core/lib/iomgr/closure.h \
--src/core/lib/iomgr/combiner.cc \
- src/core/lib/iomgr/combiner.h \
- src/core/lib/iomgr/dynamic_annotations.h \
--src/core/lib/iomgr/endpoint.cc \
- src/core/lib/iomgr/endpoint.h \
--src/core/lib/iomgr/endpoint_cfstream.cc \
- src/core/lib/iomgr/endpoint_cfstream.h \
- src/core/lib/iomgr/endpoint_pair.h \
--src/core/lib/iomgr/endpoint_pair_posix.cc \
--src/core/lib/iomgr/endpoint_pair_uv.cc \
--src/core/lib/iomgr/endpoint_pair_windows.cc \
--src/core/lib/iomgr/error.cc \
- src/core/lib/iomgr/error.h \
--src/core/lib/iomgr/error_cfstream.cc \
- src/core/lib/iomgr/error_cfstream.h \
- src/core/lib/iomgr/error_internal.h \
--src/core/lib/iomgr/ev_epoll1_linux.cc \
- src/core/lib/iomgr/ev_epoll1_linux.h \
--src/core/lib/iomgr/ev_epollex_linux.cc \
- src/core/lib/iomgr/ev_epollex_linux.h \
--src/core/lib/iomgr/ev_poll_posix.cc \
- src/core/lib/iomgr/ev_poll_posix.h \
--src/core/lib/iomgr/ev_posix.cc \
- src/core/lib/iomgr/ev_posix.h \
--src/core/lib/iomgr/ev_windows.cc \
--src/core/lib/iomgr/exec_ctx.cc \
- src/core/lib/iomgr/exec_ctx.h \
--src/core/lib/iomgr/executor.cc \
- src/core/lib/iomgr/executor.h \
--src/core/lib/iomgr/executor/mpmcqueue.cc \
- src/core/lib/iomgr/executor/mpmcqueue.h \
--src/core/lib/iomgr/executor/threadpool.cc \
- src/core/lib/iomgr/executor/threadpool.h \
--src/core/lib/iomgr/fork_posix.cc \
--src/core/lib/iomgr/fork_windows.cc \
- src/core/lib/iomgr/gethostname.h \
--src/core/lib/iomgr/gethostname_fallback.cc \
--src/core/lib/iomgr/gethostname_host_name_max.cc \
--src/core/lib/iomgr/gethostname_sysconf.cc \
- src/core/lib/iomgr/grpc_if_nametoindex.h \
--src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
--src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
--src/core/lib/iomgr/internal_errqueue.cc \
- src/core/lib/iomgr/internal_errqueue.h \
--src/core/lib/iomgr/iocp_windows.cc \
- src/core/lib/iomgr/iocp_windows.h \
--src/core/lib/iomgr/iomgr.cc \
- src/core/lib/iomgr/iomgr.h \
--src/core/lib/iomgr/iomgr_custom.cc \
- src/core/lib/iomgr/iomgr_custom.h \
--src/core/lib/iomgr/iomgr_internal.cc \
- src/core/lib/iomgr/iomgr_internal.h \
--src/core/lib/iomgr/iomgr_posix.cc \
- src/core/lib/iomgr/iomgr_posix.h \
--src/core/lib/iomgr/iomgr_posix_cfstream.cc \
--src/core/lib/iomgr/iomgr_uv.cc \
--src/core/lib/iomgr/iomgr_windows.cc \
--src/core/lib/iomgr/is_epollexclusive_available.cc \
- src/core/lib/iomgr/is_epollexclusive_available.h \
--src/core/lib/iomgr/load_file.cc \
- src/core/lib/iomgr/load_file.h \
--src/core/lib/iomgr/lockfree_event.cc \
- src/core/lib/iomgr/lockfree_event.h \
--src/core/lib/iomgr/logical_thread.cc \
- src/core/lib/iomgr/logical_thread.h \
- src/core/lib/iomgr/nameser.h \
--src/core/lib/iomgr/polling_entity.cc \
- src/core/lib/iomgr/polling_entity.h \
--src/core/lib/iomgr/pollset.cc \
- src/core/lib/iomgr/pollset.h \
--src/core/lib/iomgr/pollset_custom.cc \
- src/core/lib/iomgr/pollset_custom.h \
--src/core/lib/iomgr/pollset_set.cc \
- src/core/lib/iomgr/pollset_set.h \
--src/core/lib/iomgr/pollset_set_custom.cc \
- src/core/lib/iomgr/pollset_set_custom.h \
--src/core/lib/iomgr/pollset_set_windows.cc \
- src/core/lib/iomgr/pollset_set_windows.h \
--src/core/lib/iomgr/pollset_uv.cc \
--src/core/lib/iomgr/pollset_windows.cc \
- src/core/lib/iomgr/pollset_windows.h \
- src/core/lib/iomgr/port.h \
--src/core/lib/iomgr/resolve_address.cc \
- src/core/lib/iomgr/resolve_address.h \
--src/core/lib/iomgr/resolve_address_custom.cc \
- src/core/lib/iomgr/resolve_address_custom.h \
--src/core/lib/iomgr/resolve_address_posix.cc \
--src/core/lib/iomgr/resolve_address_windows.cc \
--src/core/lib/iomgr/resource_quota.cc \
- src/core/lib/iomgr/resource_quota.h \
- src/core/lib/iomgr/sockaddr.h \
- src/core/lib/iomgr/sockaddr_custom.h \
- src/core/lib/iomgr/sockaddr_posix.h \
--src/core/lib/iomgr/sockaddr_utils.cc \
- src/core/lib/iomgr/sockaddr_utils.h \
- src/core/lib/iomgr/sockaddr_windows.h \
--src/core/lib/iomgr/socket_factory_posix.cc \
- src/core/lib/iomgr/socket_factory_posix.h \
--src/core/lib/iomgr/socket_mutator.cc \
- src/core/lib/iomgr/socket_mutator.h \
- src/core/lib/iomgr/socket_utils.h \
--src/core/lib/iomgr/socket_utils_common_posix.cc \
--src/core/lib/iomgr/socket_utils_linux.cc \
--src/core/lib/iomgr/socket_utils_posix.cc \
- src/core/lib/iomgr/socket_utils_posix.h \
--src/core/lib/iomgr/socket_utils_uv.cc \
--src/core/lib/iomgr/socket_utils_windows.cc \
--src/core/lib/iomgr/socket_windows.cc \
- src/core/lib/iomgr/socket_windows.h \
- src/core/lib/iomgr/sys_epoll_wrapper.h \
--src/core/lib/iomgr/tcp_client.cc \
- src/core/lib/iomgr/tcp_client.h \
--src/core/lib/iomgr/tcp_client_cfstream.cc \
--src/core/lib/iomgr/tcp_client_custom.cc \
--src/core/lib/iomgr/tcp_client_posix.cc \
- src/core/lib/iomgr/tcp_client_posix.h \
--src/core/lib/iomgr/tcp_client_windows.cc \
--src/core/lib/iomgr/tcp_custom.cc \
- src/core/lib/iomgr/tcp_custom.h \
--src/core/lib/iomgr/tcp_posix.cc \
- src/core/lib/iomgr/tcp_posix.h \
--src/core/lib/iomgr/tcp_server.cc \
- src/core/lib/iomgr/tcp_server.h \
--src/core/lib/iomgr/tcp_server_custom.cc \
--src/core/lib/iomgr/tcp_server_posix.cc \
- src/core/lib/iomgr/tcp_server_utils_posix.h \
--src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
--src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
--src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
--src/core/lib/iomgr/tcp_server_windows.cc \
--src/core/lib/iomgr/tcp_uv.cc \
--src/core/lib/iomgr/tcp_windows.cc \
- src/core/lib/iomgr/tcp_windows.h \
--src/core/lib/iomgr/time_averaged_stats.cc \
- src/core/lib/iomgr/time_averaged_stats.h \
--src/core/lib/iomgr/timer.cc \
- src/core/lib/iomgr/timer.h \
--src/core/lib/iomgr/timer_custom.cc \
- src/core/lib/iomgr/timer_custom.h \
--src/core/lib/iomgr/timer_generic.cc \
--src/core/lib/iomgr/timer_heap.cc \
- src/core/lib/iomgr/timer_heap.h \
--src/core/lib/iomgr/timer_manager.cc \
- src/core/lib/iomgr/timer_manager.h \
--src/core/lib/iomgr/timer_uv.cc \
--src/core/lib/iomgr/udp_server.cc \
- src/core/lib/iomgr/udp_server.h \
--src/core/lib/iomgr/unix_sockets_posix.cc \
- src/core/lib/iomgr/unix_sockets_posix.h \
--src/core/lib/iomgr/unix_sockets_posix_noop.cc \
--src/core/lib/iomgr/wakeup_fd_eventfd.cc \
--src/core/lib/iomgr/wakeup_fd_nospecial.cc \
--src/core/lib/iomgr/wakeup_fd_pipe.cc \
- src/core/lib/iomgr/wakeup_fd_pipe.h \
--src/core/lib/iomgr/wakeup_fd_posix.cc \
- src/core/lib/iomgr/wakeup_fd_posix.h \
--src/core/lib/json/json.cc \
- src/core/lib/json/json.h \
- src/core/lib/json/json_common.h \
--src/core/lib/json/json_reader.cc \
- src/core/lib/json/json_reader.h \
--src/core/lib/json/json_string.cc \
--src/core/lib/json/json_writer.cc \
- src/core/lib/json/json_writer.h \
- src/core/lib/profiling/timers.h \
--src/core/lib/slice/b64.cc \
- src/core/lib/slice/b64.h \
--src/core/lib/slice/percent_encoding.cc \
- src/core/lib/slice/percent_encoding.h \
--src/core/lib/slice/slice.cc \
--src/core/lib/slice/slice_buffer.cc \
- src/core/lib/slice/slice_hash_table.h \
--src/core/lib/slice/slice_intern.cc \
- src/core/lib/slice/slice_internal.h \
--src/core/lib/slice/slice_string_helpers.cc \
- src/core/lib/slice/slice_string_helpers.h \
- src/core/lib/slice/slice_utils.h \
- src/core/lib/slice/slice_weak_hash_table.h \
--src/core/lib/surface/api_trace.cc \
- src/core/lib/surface/api_trace.h \
--src/core/lib/surface/byte_buffer.cc \
--src/core/lib/surface/byte_buffer_reader.cc \
--src/core/lib/surface/call.cc \
- src/core/lib/surface/call.h \
--src/core/lib/surface/call_details.cc \
--src/core/lib/surface/call_log_batch.cc \
- src/core/lib/surface/call_test_only.h \
--src/core/lib/surface/channel.cc \
- src/core/lib/surface/channel.h \
--src/core/lib/surface/channel_init.cc \
- src/core/lib/surface/channel_init.h \
--src/core/lib/surface/channel_ping.cc \
--src/core/lib/surface/channel_stack_type.cc \
- src/core/lib/surface/channel_stack_type.h \
--src/core/lib/surface/completion_queue.cc \
- src/core/lib/surface/completion_queue.h \
--src/core/lib/surface/completion_queue_factory.cc \
- src/core/lib/surface/completion_queue_factory.h \
--src/core/lib/surface/event_string.cc \
- src/core/lib/surface/event_string.h \
- src/core/lib/surface/init.h \
--src/core/lib/surface/lame_client.cc \
- src/core/lib/surface/lame_client.h \
--src/core/lib/surface/metadata_array.cc \
--src/core/lib/surface/server.cc \
- src/core/lib/surface/server.h \
--src/core/lib/surface/validate_metadata.cc \
- src/core/lib/surface/validate_metadata.h \
--src/core/lib/surface/version.cc \
--src/core/lib/transport/bdp_estimator.cc \
- src/core/lib/transport/bdp_estimator.h \
--src/core/lib/transport/byte_stream.cc \
- src/core/lib/transport/byte_stream.h \
--src/core/lib/transport/connectivity_state.cc \
- src/core/lib/transport/connectivity_state.h \
--src/core/lib/transport/error_utils.cc \
- src/core/lib/transport/error_utils.h \
- src/core/lib/transport/http2_errors.h \
--src/core/lib/transport/metadata.cc \
- src/core/lib/transport/metadata.h \
--src/core/lib/transport/metadata_batch.cc \
- src/core/lib/transport/metadata_batch.h \
--src/core/lib/transport/pid_controller.cc \
- src/core/lib/transport/pid_controller.h \
--src/core/lib/transport/static_metadata.cc \
- src/core/lib/transport/static_metadata.h \
--src/core/lib/transport/status_conversion.cc \
- src/core/lib/transport/status_conversion.h \
--src/core/lib/transport/status_metadata.cc \
- src/core/lib/transport/status_metadata.h \
--src/core/lib/transport/timeout_encoding.cc \
- src/core/lib/transport/timeout_encoding.h \
--src/core/lib/transport/transport.cc \
- src/core/lib/transport/transport.h \
- src/core/lib/transport/transport_impl.h \
--src/core/lib/transport/transport_op_string.cc \
--src/core/lib/uri/uri_parser.cc \
- src/core/lib/uri/uri_parser.h \
- src/cpp/README.md \
- src/cpp/client/channel_cc.cc \
diff --git a/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch b/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch
deleted file mode 100644
index cb3c9f6..0000000
--- a/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-From 99f8a10aec994a8957fbb6787768b444ef34d6a2 Mon Sep 17 00:00:00 2001
-From: Esun Kim <veblush@google.com>
-Date: Tue, 10 Dec 2019 22:48:33 -0800
-Subject: [PATCH] Make gRPC podspec template more robust
-
----
- gRPC-C++.podspec                     | 360 ++++++---------------------
- gRPC-Core.podspec                    | 105 ++++----
- templates/gRPC-C++.podspec.template  | 179 ++++++-------
- templates/gRPC-Core.podspec.template | 132 +++++-----
- 4 files changed, 268 insertions(+), 508 deletions(-)
-
-diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
-index 5a9a2c0add2..3eafd3550d6 100644
---- a/gRPC-C++.podspec
-+++ b/gRPC-C++.podspec
-@@ -19,7 +19,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--
- Pod::Spec.new do |s|
-   s.name     = 'gRPC-C++'
-   # TODO (mxyan): use version that match gRPC version when pod is stabilized
-@@ -65,6 +64,7 @@ Pod::Spec.new do |s|
-   }
- 
-   s.libraries = 'c++'
-+  s.compiler_flags = '-Wno-comma'
- 
-   s.default_subspecs = 'Interface', 'Implementation'
- 
-@@ -213,66 +213,9 @@ Pod::Spec.new do |s|
-     ss.header_mappings_dir = '.'
-     ss.dependency "#{s.name}/Interface", version
-     ss.dependency 'gRPC-Core', version
-+    abseil_version = '0.20190808.1'
- 
-     ss.source_files = 'include/grpcpp/impl/codegen/core_codegen.h',
--                      'src/cpp/client/channel_cc.cc',
--                      'src/cpp/client/client_context.cc',
--                      'src/cpp/client/client_interceptor.cc',
--                      'src/cpp/client/create_channel.cc',
--                      'src/cpp/client/create_channel_internal.cc',
--                      'src/cpp/client/create_channel_internal.h',
--                      'src/cpp/client/create_channel_posix.cc',
--                      'src/cpp/client/credentials_cc.cc',
--                      'src/cpp/client/generic_stub.cc',
--                      'src/cpp/client/insecure_credentials.cc',
--                      'src/cpp/client/secure_credentials.cc',
--                      'src/cpp/client/secure_credentials.h',
--                      'src/cpp/codegen/codegen_init.cc',
--                      'src/cpp/common/alarm.cc',
--                      'src/cpp/common/auth_property_iterator.cc',
--                      'src/cpp/common/channel_arguments.cc',
--                      'src/cpp/common/channel_filter.cc',
--                      'src/cpp/common/channel_filter.h',
--                      'src/cpp/common/completion_queue_cc.cc',
--                      'src/cpp/common/core_codegen.cc',
--                      'src/cpp/common/resource_quota_cc.cc',
--                      'src/cpp/common/rpc_method.cc',
--                      'src/cpp/common/secure_auth_context.cc',
--                      'src/cpp/common/secure_auth_context.h',
--                      'src/cpp/common/secure_channel_arguments.cc',
--                      'src/cpp/common/secure_create_auth_context.cc',
--                      'src/cpp/common/tls_credentials_options.cc',
--                      'src/cpp/common/tls_credentials_options_util.cc',
--                      'src/cpp/common/tls_credentials_options_util.h',
--                      'src/cpp/common/validate_service_config.cc',
--                      'src/cpp/common/version_cc.cc',
--                      'src/cpp/server/async_generic_service.cc',
--                      'src/cpp/server/channel_argument_option.cc',
--                      'src/cpp/server/create_default_thread_pool.cc',
--                      'src/cpp/server/dynamic_thread_pool.cc',
--                      'src/cpp/server/dynamic_thread_pool.h',
--                      'src/cpp/server/external_connection_acceptor_impl.cc',
--                      'src/cpp/server/external_connection_acceptor_impl.h',
--                      'src/cpp/server/health/default_health_check_service.cc',
--                      'src/cpp/server/health/default_health_check_service.h',
--                      'src/cpp/server/health/health_check_service.cc',
--                      'src/cpp/server/health/health_check_service_server_builder_option.cc',
--                      'src/cpp/server/insecure_server_credentials.cc',
--                      'src/cpp/server/secure_server_credentials.cc',
--                      'src/cpp/server/secure_server_credentials.h',
--                      'src/cpp/server/server_builder.cc',
--                      'src/cpp/server/server_callback.cc',
--                      'src/cpp/server/server_cc.cc',
--                      'src/cpp/server/server_context.cc',
--                      'src/cpp/server/server_credentials.cc',
--                      'src/cpp/server/server_posix.cc',
--                      'src/cpp/server/thread_pool_interface.h',
--                      'src/cpp/thread_manager/thread_manager.cc',
--                      'src/cpp/thread_manager/thread_manager.h',
--                      'src/cpp/util/byte_buffer_cc.cc',
--                      'src/cpp/util/status.cc',
--                      'src/cpp/util/string_ref.cc',
--                      'src/cpp/util/time_cc.cc',
-                       'src/core/ext/filters/client_channel/backend_metric.h',
-                       'src/core/ext/filters/client_channel/backup_poller.h',
-                       'src/core/ext/filters/client_channel/client_channel.h',
-@@ -628,6 +571,64 @@ Pod::Spec.new do |s|
-                       'src/core/tsi/transport_security.h',
-                       'src/core/tsi/transport_security_grpc.h',
-                       'src/core/tsi/transport_security_interface.h',
-+                      'src/cpp/client/channel_cc.cc',
-+                      'src/cpp/client/client_context.cc',
-+                      'src/cpp/client/client_interceptor.cc',
-+                      'src/cpp/client/create_channel.cc',
-+                      'src/cpp/client/create_channel_internal.cc',
-+                      'src/cpp/client/create_channel_internal.h',
-+                      'src/cpp/client/create_channel_posix.cc',
-+                      'src/cpp/client/credentials_cc.cc',
-+                      'src/cpp/client/generic_stub.cc',
-+                      'src/cpp/client/insecure_credentials.cc',
-+                      'src/cpp/client/secure_credentials.cc',
-+                      'src/cpp/client/secure_credentials.h',
-+                      'src/cpp/codegen/codegen_init.cc',
-+                      'src/cpp/common/alarm.cc',
-+                      'src/cpp/common/auth_property_iterator.cc',
-+                      'src/cpp/common/channel_arguments.cc',
-+                      'src/cpp/common/channel_filter.cc',
-+                      'src/cpp/common/channel_filter.h',
-+                      'src/cpp/common/completion_queue_cc.cc',
-+                      'src/cpp/common/core_codegen.cc',
-+                      'src/cpp/common/resource_quota_cc.cc',
-+                      'src/cpp/common/rpc_method.cc',
-+                      'src/cpp/common/secure_auth_context.cc',
-+                      'src/cpp/common/secure_auth_context.h',
-+                      'src/cpp/common/secure_channel_arguments.cc',
-+                      'src/cpp/common/secure_create_auth_context.cc',
-+                      'src/cpp/common/tls_credentials_options.cc',
-+                      'src/cpp/common/tls_credentials_options_util.cc',
-+                      'src/cpp/common/tls_credentials_options_util.h',
-+                      'src/cpp/common/validate_service_config.cc',
-+                      'src/cpp/common/version_cc.cc',
-+                      'src/cpp/server/async_generic_service.cc',
-+                      'src/cpp/server/channel_argument_option.cc',
-+                      'src/cpp/server/create_default_thread_pool.cc',
-+                      'src/cpp/server/dynamic_thread_pool.cc',
-+                      'src/cpp/server/dynamic_thread_pool.h',
-+                      'src/cpp/server/external_connection_acceptor_impl.cc',
-+                      'src/cpp/server/external_connection_acceptor_impl.h',
-+                      'src/cpp/server/health/default_health_check_service.cc',
-+                      'src/cpp/server/health/default_health_check_service.h',
-+                      'src/cpp/server/health/health_check_service.cc',
-+                      'src/cpp/server/health/health_check_service_server_builder_option.cc',
-+                      'src/cpp/server/insecure_server_credentials.cc',
-+                      'src/cpp/server/secure_server_credentials.cc',
-+                      'src/cpp/server/secure_server_credentials.h',
-+                      'src/cpp/server/server_builder.cc',
-+                      'src/cpp/server/server_callback.cc',
-+                      'src/cpp/server/server_cc.cc',
-+                      'src/cpp/server/server_context.cc',
-+                      'src/cpp/server/server_credentials.cc',
-+                      'src/cpp/server/server_posix.cc',
-+                      'src/cpp/server/thread_pool_interface.h',
-+                      'src/cpp/thread_manager/thread_manager.cc',
-+                      'src/cpp/thread_manager/thread_manager.h',
-+                      'src/cpp/util/byte_buffer_cc.cc',
-+                      'src/cpp/util/status.cc',
-+                      'src/cpp/util/string_ref.cc',
-+                      'src/cpp/util/time_cc.cc',
-                       'third_party/upb/upb/decode.h',
-                       'third_party/upb/upb/encode.h',
-                       'third_party/upb/upb/generated_util.h',
-@@ -638,235 +639,6 @@ Pod::Spec.new do |s|
-                       'third_party/upb/upb/upb.h'
- 
-     ss.private_header_files = 'include/grpcpp/impl/codegen/core_codegen.h',
--                              'src/core/ext/filters/client_channel/backend_metric.h',
--                              'src/core/ext/filters/client_channel/backup_poller.h',
--                              'src/core/ext/filters/client_channel/client_channel.h',
--                              'src/core/ext/filters/client_channel/client_channel_channelz.h',
--                              'src/core/ext/filters/client_channel/client_channel_factory.h',
--                              'src/core/ext/filters/client_channel/connector.h',
--                              'src/core/ext/filters/client_channel/global_subchannel_pool.h',
--                              'src/core/ext/filters/client_channel/health/health_check_client.h',
--                              'src/core/ext/filters/client_channel/http_connect_handshaker.h',
--                              'src/core/ext/filters/client_channel/http_proxy.h',
--                              'src/core/ext/filters/client_channel/lb_policy.h',
--                              'src/core/ext/filters/client_channel/lb_policy_factory.h',
--                              'src/core/ext/filters/client_channel/lb_policy_registry.h',
--                              'src/core/ext/filters/client_channel/local_subchannel_pool.h',
--                              'src/core/ext/filters/client_channel/parse_address.h',
--                              'src/core/ext/filters/client_channel/proxy_mapper.h',
--                              'src/core/ext/filters/client_channel/proxy_mapper_registry.h',
--                              'src/core/ext/filters/client_channel/resolver.h',
--                              'src/core/ext/filters/client_channel/resolver_factory.h',
--                              'src/core/ext/filters/client_channel/resolver_registry.h',
--                              'src/core/ext/filters/client_channel/resolver_result_parsing.h',
--                              'src/core/ext/filters/client_channel/resolving_lb_policy.h',
--                              'src/core/ext/filters/client_channel/retry_throttle.h',
--                              'src/core/ext/filters/client_channel/server_address.h',
--                              'src/core/ext/filters/client_channel/service_config.h',
--                              'src/core/ext/filters/client_channel/subchannel.h',
--                              'src/core/ext/filters/client_channel/subchannel_interface.h',
--                              'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
--                              'src/core/ext/filters/deadline/deadline_filter.h',
--                              'src/core/ext/transport/inproc/inproc_transport.h',
--                              'src/core/ext/upb-generated/gogoproto/gogo.upb.h',
--                              'src/core/ext/upb-generated/google/api/annotations.upb.h',
--                              'src/core/ext/upb-generated/google/api/http.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/any.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/duration.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/empty.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/struct.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h',
--                              'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h',
--                              'src/core/ext/upb-generated/google/rpc/status.upb.h',
--                              'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.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/lib/avl/avl.h',
--                              'src/core/lib/backoff/backoff.h',
--                              'src/core/lib/channel/channel_args.h',
--                              'src/core/lib/channel/channel_stack.h',
--                              'src/core/lib/channel/channel_stack_builder.h',
--                              'src/core/lib/channel/channel_trace.h',
--                              'src/core/lib/channel/channelz.h',
--                              'src/core/lib/channel/channelz_registry.h',
--                              'src/core/lib/channel/connected_channel.h',
--                              'src/core/lib/channel/context.h',
--                              'src/core/lib/channel/handshaker.h',
--                              'src/core/lib/channel/handshaker_factory.h',
--                              'src/core/lib/channel/handshaker_registry.h',
--                              'src/core/lib/channel/status_util.h',
--                              'src/core/lib/compression/algorithm_metadata.h',
--                              'src/core/lib/compression/compression_args.h',
--                              'src/core/lib/compression/compression_internal.h',
--                              'src/core/lib/compression/message_compress.h',
--                              'src/core/lib/compression/stream_compression.h',
--                              'src/core/lib/compression/stream_compression_gzip.h',
--                              'src/core/lib/compression/stream_compression_identity.h',
--                              'src/core/lib/debug/stats.h',
--                              'src/core/lib/debug/stats_data.h',
--                              'src/core/lib/debug/trace.h',
--                              'src/core/lib/gpr/alloc.h',
--                              'src/core/lib/gpr/arena.h',
--                              'src/core/lib/gpr/env.h',
--                              'src/core/lib/gpr/murmur_hash.h',
--                              'src/core/lib/gpr/spinlock.h',
--                              'src/core/lib/gpr/string.h',
--                              'src/core/lib/gpr/string_windows.h',
--                              'src/core/lib/gpr/time_precise.h',
--                              'src/core/lib/gpr/tls.h',
--                              'src/core/lib/gpr/tls_gcc.h',
--                              'src/core/lib/gpr/tls_msvc.h',
--                              'src/core/lib/gpr/tls_pthread.h',
--                              'src/core/lib/gpr/tmpfile.h',
--                              'src/core/lib/gpr/useful.h',
--                              'src/core/lib/gprpp/arena.h',
--                              'src/core/lib/gprpp/atomic.h',
--                              'src/core/lib/gprpp/debug_location.h',
--                              'src/core/lib/gprpp/fork.h',
--                              'src/core/lib/gprpp/global_config.h',
--                              'src/core/lib/gprpp/global_config_custom.h',
--                              'src/core/lib/gprpp/global_config_env.h',
--                              'src/core/lib/gprpp/global_config_generic.h',
--                              'src/core/lib/gprpp/host_port.h',
--                              'src/core/lib/gprpp/inlined_vector.h',
--                              'src/core/lib/gprpp/manual_constructor.h',
--                              'src/core/lib/gprpp/map.h',
--                              'src/core/lib/gprpp/memory.h',
--                              'src/core/lib/gprpp/mpscq.h',
--                              'src/core/lib/gprpp/optional.h',
--                              'src/core/lib/gprpp/orphanable.h',
--                              'src/core/lib/gprpp/ref_counted.h',
--                              'src/core/lib/gprpp/ref_counted_ptr.h',
--                              'src/core/lib/gprpp/string_view.h',
--                              'src/core/lib/gprpp/sync.h',
--                              'src/core/lib/gprpp/thd.h',
--                              'src/core/lib/http/format_request.h',
--                              'src/core/lib/http/httpcli.h',
--                              'src/core/lib/http/parser.h',
--                              'src/core/lib/iomgr/block_annotate.h',
--                              'src/core/lib/iomgr/buffer_list.h',
--                              'src/core/lib/iomgr/call_combiner.h',
--                              'src/core/lib/iomgr/cfstream_handle.h',
--                              'src/core/lib/iomgr/closure.h',
--                              'src/core/lib/iomgr/combiner.h',
--                              'src/core/lib/iomgr/dynamic_annotations.h',
--                              'src/core/lib/iomgr/endpoint.h',
--                              'src/core/lib/iomgr/endpoint_cfstream.h',
--                              'src/core/lib/iomgr/endpoint_pair.h',
--                              'src/core/lib/iomgr/error.h',
--                              'src/core/lib/iomgr/error_cfstream.h',
--                              'src/core/lib/iomgr/error_internal.h',
--                              'src/core/lib/iomgr/ev_epoll1_linux.h',
--                              'src/core/lib/iomgr/ev_epollex_linux.h',
--                              'src/core/lib/iomgr/ev_poll_posix.h',
--                              'src/core/lib/iomgr/ev_posix.h',
--                              'src/core/lib/iomgr/exec_ctx.h',
--                              'src/core/lib/iomgr/executor.h',
--                              'src/core/lib/iomgr/executor/mpmcqueue.h',
--                              'src/core/lib/iomgr/executor/threadpool.h',
--                              'src/core/lib/iomgr/gethostname.h',
--                              'src/core/lib/iomgr/grpc_if_nametoindex.h',
--                              'src/core/lib/iomgr/internal_errqueue.h',
--                              'src/core/lib/iomgr/iocp_windows.h',
--                              'src/core/lib/iomgr/iomgr.h',
--                              'src/core/lib/iomgr/iomgr_custom.h',
--                              'src/core/lib/iomgr/iomgr_internal.h',
--                              'src/core/lib/iomgr/iomgr_posix.h',
--                              'src/core/lib/iomgr/is_epollexclusive_available.h',
--                              'src/core/lib/iomgr/load_file.h',
--                              'src/core/lib/iomgr/lockfree_event.h',
--                              'src/core/lib/iomgr/logical_thread.h',
--                              'src/core/lib/iomgr/nameser.h',
--                              'src/core/lib/iomgr/polling_entity.h',
--                              'src/core/lib/iomgr/pollset.h',
--                              'src/core/lib/iomgr/pollset_custom.h',
--                              'src/core/lib/iomgr/pollset_set.h',
--                              'src/core/lib/iomgr/pollset_set_custom.h',
--                              'src/core/lib/iomgr/pollset_set_windows.h',
--                              'src/core/lib/iomgr/pollset_windows.h',
--                              'src/core/lib/iomgr/port.h',
--                              'src/core/lib/iomgr/resolve_address.h',
--                              'src/core/lib/iomgr/resolve_address_custom.h',
--                              'src/core/lib/iomgr/resource_quota.h',
--                              'src/core/lib/iomgr/sockaddr.h',
--                              'src/core/lib/iomgr/sockaddr_custom.h',
--                              'src/core/lib/iomgr/sockaddr_posix.h',
--                              'src/core/lib/iomgr/sockaddr_utils.h',
--                              'src/core/lib/iomgr/sockaddr_windows.h',
--                              'src/core/lib/iomgr/socket_factory_posix.h',
--                              'src/core/lib/iomgr/socket_mutator.h',
--                              'src/core/lib/iomgr/socket_utils.h',
--                              'src/core/lib/iomgr/socket_utils_posix.h',
--                              'src/core/lib/iomgr/socket_windows.h',
--                              'src/core/lib/iomgr/sys_epoll_wrapper.h',
--                              'src/core/lib/iomgr/tcp_client.h',
--                              'src/core/lib/iomgr/tcp_client_posix.h',
--                              'src/core/lib/iomgr/tcp_custom.h',
--                              'src/core/lib/iomgr/tcp_posix.h',
--                              'src/core/lib/iomgr/tcp_server.h',
--                              'src/core/lib/iomgr/tcp_server_utils_posix.h',
--                              'src/core/lib/iomgr/tcp_windows.h',
--                              'src/core/lib/iomgr/time_averaged_stats.h',
--                              'src/core/lib/iomgr/timer.h',
--                              'src/core/lib/iomgr/timer_custom.h',
--                              'src/core/lib/iomgr/timer_heap.h',
--                              'src/core/lib/iomgr/timer_manager.h',
--                              'src/core/lib/iomgr/udp_server.h',
--                              'src/core/lib/iomgr/unix_sockets_posix.h',
--                              'src/core/lib/iomgr/wakeup_fd_pipe.h',
--                              'src/core/lib/iomgr/wakeup_fd_posix.h',
--                              'src/core/lib/json/json.h',
--                              'src/core/lib/json/json_common.h',
--                              'src/core/lib/json/json_reader.h',
--                              'src/core/lib/json/json_writer.h',
--                              'src/core/lib/profiling/timers.h',
--                              'src/core/lib/slice/b64.h',
--                              'src/core/lib/slice/percent_encoding.h',
--                              'src/core/lib/slice/slice_hash_table.h',
--                              'src/core/lib/slice/slice_internal.h',
--                              'src/core/lib/slice/slice_string_helpers.h',
--                              'src/core/lib/slice/slice_utils.h',
--                              'src/core/lib/slice/slice_weak_hash_table.h',
--                              'src/core/lib/surface/api_trace.h',
--                              'src/core/lib/surface/call.h',
--                              'src/core/lib/surface/call_test_only.h',
--                              'src/core/lib/surface/channel.h',
--                              'src/core/lib/surface/channel_init.h',
--                              'src/core/lib/surface/channel_stack_type.h',
--                              'src/core/lib/surface/completion_queue.h',
--                              'src/core/lib/surface/completion_queue_factory.h',
--                              'src/core/lib/surface/event_string.h',
--                              'src/core/lib/surface/init.h',
--                              'src/core/lib/surface/lame_client.h',
--                              'src/core/lib/surface/server.h',
--                              'src/core/lib/surface/validate_metadata.h',
--                              'src/core/lib/transport/bdp_estimator.h',
--                              'src/core/lib/transport/byte_stream.h',
--                              'src/core/lib/transport/connectivity_state.h',
--                              'src/core/lib/transport/error_utils.h',
--                              'src/core/lib/transport/http2_errors.h',
--                              'src/core/lib/transport/metadata.h',
--                              'src/core/lib/transport/metadata_batch.h',
--                              'src/core/lib/transport/pid_controller.h',
--                              'src/core/lib/transport/static_metadata.h',
--                              'src/core/lib/transport/status_conversion.h',
--                              'src/core/lib/transport/status_metadata.h',
--                              'src/core/lib/transport/timeout_encoding.h',
--                              'src/core/lib/transport/transport.h',
--                              'src/core/lib/transport/transport_impl.h',
--                              'src/core/lib/uri/uri_parser.h',
--                              'src/cpp/client/create_channel_internal.h',
--                              'src/cpp/client/secure_credentials.h',
--                              'src/cpp/common/channel_filter.h',
--                              'src/cpp/common/secure_auth_context.h',
--                              'src/cpp/common/tls_credentials_options_util.h',
--                              'src/cpp/server/dynamic_thread_pool.h',
--                              'src/cpp/server/external_connection_acceptor_impl.h',
--                              'src/cpp/server/health/default_health_check_service.h',
--                              'src/cpp/server/secure_server_credentials.h',
--                              'src/cpp/server/thread_pool_interface.h',
--                              'src/cpp/thread_manager/thread_manager.h',
-                               'src/core/ext/filters/client_channel/backend_metric.h',
-                               'src/core/ext/filters/client_channel/backup_poller.h',
-                               'src/core/ext/filters/client_channel/client_channel.h',
-@@ -1222,6 +994,17 @@ Pod::Spec.new do |s|
-                               'src/core/tsi/transport_security.h',
-                               'src/core/tsi/transport_security_grpc.h',
-                               'src/core/tsi/transport_security_interface.h',
-+                              'src/cpp/client/create_channel_internal.h',
-+                              'src/cpp/client/secure_credentials.h',
-+                              'src/cpp/common/channel_filter.h',
-+                              'src/cpp/common/secure_auth_context.h',
-+                              'src/cpp/common/tls_credentials_options_util.h',
-+                              'src/cpp/server/dynamic_thread_pool.h',
-+                              'src/cpp/server/external_connection_acceptor_impl.h',
-+                              'src/cpp/server/health/default_health_check_service.h',
-+                              'src/cpp/server/secure_server_credentials.h',
-+                              'src/cpp/server/thread_pool_interface.h',
-+                              'src/cpp/thread_manager/thread_manager.h',
-                               'third_party/upb/upb/decode.h',
-                               'third_party/upb/upb/encode.h',
-                               'third_party/upb/upb/generated_util.h',
-@@ -1237,7 +1020,6 @@ Pod::Spec.new do |s|
-     ss.dependency "#{s.name}/Interface", version
- 
-     ss.source_files = 'include/grpcpp/impl/codegen/config_protobuf.h',
--                      'include/grpcpp/impl/codegen/config_protobuf.h',
-                       'include/grpcpp/impl/codegen/proto_buffer_reader.h',
-                       'include/grpcpp/impl/codegen/proto_buffer_writer.h',
-                       'include/grpcpp/impl/codegen/proto_utils.h'
-diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
-index 5b306628b20..ec4a29465de 100644
---- a/gRPC-Core.podspec
-+++ b/gRPC-Core.podspec
-@@ -19,7 +19,6 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--
- Pod::Spec.new do |s|
-   s.name     = 'gRPC-Core'
-   version = '1.26.0'
-@@ -97,7 +96,7 @@ Pod::Spec.new do |s|
-   }
- 
-   s.default_subspecs = 'Interface', 'Implementation'
--  s.compiler_flags = '-DGRPC_ARES=0'
-+  s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma'
-   s.libraries = 'c++'
- 
-   # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
-@@ -123,40 +122,26 @@ Pod::Spec.new do |s|
-                       'include/grpc/grpc_security.h',
-                       'include/grpc/grpc_security_constants.h',
-                       'include/grpc/impl/codegen/atm.h',
--                      'include/grpc/impl/codegen/atm.h',
-                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
--                      'include/grpc/impl/codegen/atm_gcc_atomic.h',
--                      'include/grpc/impl/codegen/atm_gcc_sync.h',
-                       'include/grpc/impl/codegen/atm_gcc_sync.h',
-                       'include/grpc/impl/codegen/atm_windows.h',
--                      'include/grpc/impl/codegen/atm_windows.h',
-                       'include/grpc/impl/codegen/byte_buffer.h',
-                       'include/grpc/impl/codegen/byte_buffer_reader.h',
-                       'include/grpc/impl/codegen/compression_types.h',
-                       'include/grpc/impl/codegen/connectivity_state.h',
-                       'include/grpc/impl/codegen/fork.h',
--                      'include/grpc/impl/codegen/fork.h',
--                      'include/grpc/impl/codegen/gpr_slice.h',
-                       'include/grpc/impl/codegen/gpr_slice.h',
-                       'include/grpc/impl/codegen/gpr_types.h',
--                      'include/grpc/impl/codegen/gpr_types.h',
-                       'include/grpc/impl/codegen/grpc_types.h',
-                       'include/grpc/impl/codegen/log.h',
--                      'include/grpc/impl/codegen/log.h',
--                      'include/grpc/impl/codegen/port_platform.h',
-                       'include/grpc/impl/codegen/port_platform.h',
-                       'include/grpc/impl/codegen/propagation_bits.h',
-                       'include/grpc/impl/codegen/slice.h',
-                       'include/grpc/impl/codegen/status.h',
-                       'include/grpc/impl/codegen/sync.h',
--                      'include/grpc/impl/codegen/sync.h',
--                      'include/grpc/impl/codegen/sync_custom.h',
-                       'include/grpc/impl/codegen/sync_custom.h',
-                       'include/grpc/impl/codegen/sync_generic.h',
--                      'include/grpc/impl/codegen/sync_generic.h',
-                       'include/grpc/impl/codegen/sync_posix.h',
--                      'include/grpc/impl/codegen/sync_posix.h',
--                      'include/grpc/impl/codegen/sync_windows.h',
-                       'include/grpc/impl/codegen/sync_windows.h',
-                       'include/grpc/load_reporting.h',
-                       'include/grpc/slice.h',
-@@ -186,6 +171,7 @@ Pod::Spec.new do |s|
-     ss.libraries = 'z'
-     ss.dependency "#{s.name}/Interface", version
-     ss.dependency 'BoringSSL-GRPC', '0.0.5'
-+    abseil_version = '0.20190808.1'
-     ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'
- 
-     ss.source_files = 'src/core/ext/filters/census/grpc_context.cc',
-@@ -969,7 +955,6 @@ Pod::Spec.new do |s|
-                       'third_party/upb/upb/table.int.h',
-                       'third_party/upb/upb/upb.c',
-                       'third_party/upb/upb/upb.h'
--
-     ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
-                               'src/core/ext/filters/client_channel/backup_poller.h',
-                               'src/core/ext/filters/client_channel/client_channel.h',
-@@ -1372,54 +1357,15 @@ Pod::Spec.new do |s|
-                       'test/core/end2end/data/server1_key.cc',
-                       'test/core/end2end/data/ssl_test_data.h',
-                       'test/core/end2end/data/test_root_cert.cc',
-+                      'test/core/end2end/end2end_test_utils.cc',
-+                      'test/core/end2end/end2end_tests.cc',
-+                      'test/core/end2end/end2end_tests.h',
-                       'test/core/end2end/fixtures/http_proxy_fixture.cc',
-                       'test/core/end2end/fixtures/http_proxy_fixture.h',
-                       'test/core/end2end/fixtures/local_util.cc',
-                       'test/core/end2end/fixtures/local_util.h',
-                       'test/core/end2end/fixtures/proxy.cc',
-                       'test/core/end2end/fixtures/proxy.h',
--                      'test/core/iomgr/endpoint_tests.cc',
--                      'test/core/iomgr/endpoint_tests.h',
--                      'test/core/security/oauth2_utils.cc',
--                      'test/core/security/oauth2_utils.h',
--                      'test/core/util/cmdline.cc',
--                      'test/core/util/cmdline.h',
--                      'test/core/util/debugger_macros.cc',
--                      'test/core/util/debugger_macros.h',
--                      'test/core/util/fuzzer_util.cc',
--                      'test/core/util/fuzzer_util.h',
--                      'test/core/util/grpc_profiler.cc',
--                      'test/core/util/grpc_profiler.h',
--                      'test/core/util/histogram.cc',
--                      'test/core/util/histogram.h',
--                      'test/core/util/memory_counters.cc',
--                      'test/core/util/memory_counters.h',
--                      'test/core/util/mock_endpoint.cc',
--                      'test/core/util/mock_endpoint.h',
--                      'test/core/util/parse_hexstring.cc',
--                      'test/core/util/parse_hexstring.h',
--                      'test/core/util/passthru_endpoint.cc',
--                      'test/core/util/passthru_endpoint.h',
--                      'test/core/util/port.cc',
--                      'test/core/util/port.h',
--                      'test/core/util/port_isolated_runtime_environment.cc',
--                      'test/core/util/port_server_client.cc',
--                      'test/core/util/port_server_client.h',
--                      'test/core/util/slice_splitter.cc',
--                      'test/core/util/slice_splitter.h',
--                      'test/core/util/subprocess.h',
--                      'test/core/util/subprocess_windows.cc',
--                      'test/core/util/test_config.cc',
--                      'test/core/util/test_config.h',
--                      'test/core/util/test_lb_policies.cc',
--                      'test/core/util/test_lb_policies.h',
--                      'test/core/util/tracer_util.cc',
--                      'test/core/util/tracer_util.h',
--                      'test/core/util/trickle_endpoint.cc',
--                      'test/core/util/trickle_endpoint.h',
--                      'test/core/end2end/end2end_test_utils.cc',
--                      'test/core/end2end/end2end_tests.cc',
--                      'test/core/end2end/end2end_tests.h',
-                       'test/core/end2end/tests/authority_not_supported.cc',
-                       'test/core/end2end/tests/bad_hostname.cc',
-                       'test/core/end2end/tests/bad_ping.cc',
-@@ -1498,7 +1444,46 @@ Pod::Spec.new do |s|
-                       'test/core/end2end/tests/trailing_metadata.cc',
-                       'test/core/end2end/tests/workaround_cronet_compression.cc',
-                       'test/core/end2end/tests/write_buffering.cc',
--                      'test/core/end2end/tests/write_buffering_at_end.cc'
-+                      'test/core/end2end/tests/write_buffering_at_end.cc',
-+                      'test/core/iomgr/endpoint_tests.cc',
-+                      'test/core/iomgr/endpoint_tests.h',
-+                      'test/core/security/oauth2_utils.cc',
-+                      'test/core/security/oauth2_utils.h',
-+                      'test/core/util/cmdline.cc',
-+                      'test/core/util/cmdline.h',
-+                      'test/core/util/debugger_macros.cc',
-+                      'test/core/util/debugger_macros.h',
-+                      'test/core/util/fuzzer_util.cc',
-+                      'test/core/util/fuzzer_util.h',
-+                      'test/core/util/grpc_profiler.cc',
-+                      'test/core/util/grpc_profiler.h',
-+                      'test/core/util/histogram.cc',
-+                      'test/core/util/histogram.h',
-+                      'test/core/util/memory_counters.cc',
-+                      'test/core/util/memory_counters.h',
-+                      'test/core/util/mock_endpoint.cc',
-+                      'test/core/util/mock_endpoint.h',
-+                      'test/core/util/parse_hexstring.cc',
-+                      'test/core/util/parse_hexstring.h',
-+                      'test/core/util/passthru_endpoint.cc',
-+                      'test/core/util/passthru_endpoint.h',
-+                      'test/core/util/port.cc',
-+                      'test/core/util/port.h',
-+                      'test/core/util/port_isolated_runtime_environment.cc',
-+                      'test/core/util/port_server_client.cc',
-+                      'test/core/util/port_server_client.h',
-+                      'test/core/util/slice_splitter.cc',
-+                      'test/core/util/slice_splitter.h',
-+                      'test/core/util/subprocess.h',
-+                      'test/core/util/subprocess_windows.cc',
-+                      'test/core/util/test_config.cc',
-+                      'test/core/util/test_config.h',
-+                      'test/core/util/test_lb_policies.cc',
-+                      'test/core/util/test_lb_policies.h',
-+                      'test/core/util/tracer_util.cc',
-+                      'test/core/util/tracer_util.h',
-+                      'test/core/util/trickle_endpoint.cc',
-+                      'test/core/util/trickle_endpoint.h'
-   end
- 
-   # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
-diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template
-index 0a31cc5066b..ef0801c6735 100644
---- a/templates/gRPC-C++.podspec.template
-+++ b/templates/gRPC-C++.podspec.template
-@@ -20,108 +20,84 @@
-   # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   # See the License for the specific language governing permissions and
-   # limitations under the License.
-+  <%
-+  lib_maps = {lib.name: lib for lib in libs}
-+  filegroup_maps = {filegroup.name: filegroup for filegroup in filegroups}
- 
--  <%!
--  def grpc_lib_files(libs, expect_libs, groups):
-+  def ruby_multiline_list(files, indent):
-+    return (',\n' + indent*' ').join('\'%s\'' % f for f in files)
-+
-+  def is_absl_lib(target_name):
-+    return target_name.startswith("absl/")
-+
-+  def get_absl_spec_name(label):
-+    # e.g. absl/apple:banana -> abseil/apple/banana
-+    return "abseil/" + label[5:].replace(":", "/")
-+
-+  def lib_and_transitive_deps(lib):
-+    return list(sorted(set({lib} | lib_maps[lib].transitive_deps)))
-+
-+  def non_abseil_lib_and_transitive_deps(lib):
-+    return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)]
-+
-+  def list_abseil_specs(lib):
-+    # This returns a list of abseil specs which the given lib and
-+    # its non-abseil transitive dependencies depend on.
-+    # As a result, internal abseil libraries are excluded from the result.
-+    absl_specs = set()
-+    for lib_name in lib_and_transitive_deps(lib):
-+      if is_absl_lib(lib_name): continue
-+      for dep in lib_maps[lib_name].deps:
-+        if is_absl_lib(dep):
-+          absl_specs.add(get_absl_spec_name(dep))
-+    return list(sorted(absl_specs))
-+
-+  def list_lib_files(lib, fields):
-+    files = set()
-+    for lib_name in non_abseil_lib_and_transitive_deps(lib):
-+      lib = lib_maps[lib_name]
-+      for field in fields:
-+        files.update(lib.get(field, []))
-+    return list(sorted(files))
-+
-+  def list_filegroup_files(expect_filegroups, groups):
-     out = []
--    for lib in libs:
--      if lib.name in expect_libs:
--        for group in groups:
--          out += lib.get(group, [])
--    return sorted(out)
-+    for filegroup_name in expect_filegroups:
-+      filegroup = filegroup_maps[filegroup_name]
-+      for group in groups:
-+        out += filegroup.get(group, [])
-+    return list(sorted(set(out)))
- 
-   def filter_grpcpp(files):
--    return [file for file in files if not file.startswith("include/grpc++")]
--
--  grpc_libs = ("grpc", "gpr", "upb")
--
--  def grpc_private_files(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("headers", "src"))
--    return out
--
--  def grpc_private_headers(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("headers",))
--    return out
--
--  def grpc_public_headers(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("public_headers",))
--    return out
--
--  def grpcpp_proto_files(filegroups):
--    out = grpc_lib_files(filegroups, ("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src", "public_headers"))
--    excl_files = grpc_lib_files(filegroups, ("grpc++_codegen_base",), ("headers", "src", "public_headers"))
--    out = [file for file in out if file not in excl_files]
--    out = filter_grpcpp(out)
--    return out
--
--  def grpcpp_private_files(libs, filegroups):
--    out = grpc_lib_files(libs, ("grpc++",), ("headers", "src"))
--    excl_files = grpc_private_files(libs)
--
-+    return sorted([file for file in files if not file.startswith("include/grpc++")])
-+
-+  grpc_private_files = list_lib_files("grpc", ("headers", "src"))
-+  grpc_public_headers = list_lib_files("grpc", ("public_headers",))
-+  grpc_private_headers = list_lib_files("grpc", ("headers",))
-+
-+  grpcpp_proto_files = filter_grpcpp(
-+    set(list_filegroup_files(("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src", "public_headers")))
-+    - set(list_filegroup_files(("grpc++_codegen_base",), ("headers", "src", "public_headers")))
-+  )
-+  grpcpp_private_files = filter_grpcpp(
-+    set(list_lib_files("grpc++", ("headers", "src")))
-+    - set(grpc_private_files)
-     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
--    excl_files += grpcpp_proto_files(filegroups)
--    out = [file for file in out if file not in excl_files]
--
--    out = filter_grpcpp(out)
--    return out
--
--  def grpcpp_private_headers(libs, filegroups):
--    out = grpc_lib_files(libs, ("grpc++",), ("headers",))
--    excl_files = grpc_private_headers(libs)
--
-+    - set(grpcpp_proto_files)
-+  )
-+  grpcpp_private_headers = filter_grpcpp(
-+    set(list_lib_files("grpc++", ("headers",)))
-+    - set(grpc_private_headers)
-     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
--    excl_files = grpcpp_proto_files(filegroups)
--    out = [file for file in out if file not in excl_files]
--
--    out = filter_grpcpp(out)
--    return out
--
--  def grpcpp_public_headers(libs, filegroups):
--    out = grpc_lib_files(libs, ("grpc++",), ("public_headers",))
--    excl_files = grpc_public_headers(libs)
--
-+    - set(grpcpp_proto_files)
-+  )
-+  grpcpp_public_headers = filter_grpcpp(
-+    set(list_lib_files("grpc++", ("public_headers",)))
-+    - set(grpc_public_headers)
-     # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
--    excl_files += grpcpp_proto_files(filegroups)
--
--    out = [file for file in out if file not in excl_files]
--
--    out = filter_grpcpp(out)
--
--    return out
--
--  def grpc_test_util_files(libs):
--    out = grpc_lib_files(libs, ("grpc_test_util",), ("src", "headers"))
--    return out
--
--  def grpc_test_util_headers(libs):
--    out = grpc_lib_files(libs, ("grpc_test_util",), ("headers",))
--    return out
--
--  # Tests subspec is currently disabled since the tests currently use `grpc++` include style instead of `grpcpp`.
--  # TODO (mxyan): enable Tests subspec after the inclusion style is updated in `test/` directory.
--  def grpcpp_test_util_files(libs, filegroups):
--    out = grpc_lib_files(libs, ("grpc++_test_util",), ("src", "headers"))
--    excl_files = grpc_test_util_files(libs) + grpcpp_private_files(libs, filegroups)
--
--    # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib
--    excl_files += grpc_lib_files(filegroups, ("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src"))
--    excl_files += ["test/cpp/util/byte_buffer_proto_helper.cc",
--                   "test/cpp/util/byte_buffer_proto_helper.h",
--                   "test/cpp/end2end/test_service_impl.cc",
--                   "test/cpp/end2end/test_service_impl.h"]
--    excl_files += [file for file in out if file.endswith(".proto")]
--
--    out = [file for file in out if not file in excl_files]
--
--    # Since some C++ test files directly included private headers in C core, we intentionally add these header
--    # files to this subspec
--    out += grpc_test_util_headers(libs)
--
--    return out
--
--  def ruby_multiline_list(files, indent):
--    return (',\n' + indent*' ').join('\'%s\'' % f for f in files)
--
-+    - set(grpcpp_proto_files)
-+  )
-+  grpcpp_abseil_specs = list_abseil_specs("grpc++")
-   %>
-   Pod::Spec.new do |s|
-     s.name     = 'gRPC-C++'
-@@ -168,6 +144,7 @@
-     }
- 
-     s.libraries = 'c++'
-+    s.compiler_flags = '-Wno-comma'
- 
-     s.default_subspecs = 'Interface', 'Implementation'
- 
-@@ -179,24 +156,28 @@
-     s.subspec 'Interface' do |ss|
-       ss.header_mappings_dir = 'include/grpcpp'
- 
--      ss.source_files = ${ruby_multiline_list(grpcpp_public_headers(libs, filegroups), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpcpp_public_headers, 22)}
-     end
- 
-     s.subspec 'Implementation' do |ss|
-       ss.header_mappings_dir = '.'
-       ss.dependency "#{s.name}/Interface", version
-       ss.dependency 'gRPC-Core', version
-+      abseil_version = '0.20190808.1'
-+      % for abseil_spec in grpcpp_abseil_specs:
-+      ss.dependency '${abseil_spec}', abseil_version
-+      % endfor
- 
--      ss.source_files = ${ruby_multiline_list(grpcpp_private_files(libs, filegroups) + grpc_private_headers(libs), 22)}
-+      ss.source_files = ${ruby_multiline_list(sorted(grpcpp_private_files + grpc_private_headers), 22)}
- 
--      ss.private_header_files = ${ruby_multiline_list(grpcpp_private_headers(libs, filegroups) + grpc_private_headers(libs), 30)}
-+      ss.private_header_files = ${ruby_multiline_list(sorted(grpcpp_private_headers + grpc_private_headers), 30)}
-     end
- 
-     s.subspec 'Protobuf' do |ss|
-       ss.header_mappings_dir = 'include/grpcpp'
-       ss.dependency "#{s.name}/Interface", version
- 
--      ss.source_files = ${ruby_multiline_list(grpcpp_proto_files(filegroups), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpcpp_proto_files, 22)}
-     end
- 
-     s.subspec 'Cronet-Interface' do |ss|
-diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
-index 9bebbdf4097..847aabc41d7 100644
---- a/templates/gRPC-Core.podspec.template
-+++ b/templates/gRPC-Core.podspec.template
-@@ -20,60 +20,70 @@
-   # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   # See the License for the specific language governing permissions and
-   # limitations under the License.
--
--  <%!
--  def grpc_lib_files(libs, expect_libs, groups):
--    out = []
--    for lib in libs:
--      if lib.name in expect_libs:
--        for group in groups:
--          out += lib.get(group, [])
--    return sorted(out)
--
--  grpc_libs = ("grpc", "gpr", "upb")
--
--  def grpc_private_files(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("headers", "src"))
--    return out
--
--  def grpc_public_headers(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("public_headers",))
--    return out
--
--  def grpc_private_headers(libs):
--    out = grpc_lib_files(libs, grpc_libs, ("headers",))
--    return out
--
--  def grpc_cronet_files(libs):
--    out = grpc_lib_files(libs, ("grpc_cronet",), ("src", "headers"))
--    excl = grpc_private_files(libs)
--    excl += [
--        # We do not need cronet dedicated plugin registry
--        "src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc",
--        # We do not need dummy cronet API for ObjC
--        "src/core/ext/transport/cronet/transport/cronet_api_dummy.cc",
--    ]
--    return [file for file in out if not file in excl]
--
--  def grpc_cronet_public_headers(libs):
--    out = grpc_lib_files(libs, ("grpc_cronet",), ("public_headers",))
--    excl = grpc_public_headers(libs)
--    return [file for file in out if not file in excl]
--
--  def grpc_test_util_files(libs):
--    out = grpc_lib_files(libs, ("grpc_test_util",), ("src", "headers"))
--    excl = grpc_private_files(libs)
--    # Subprocess is not supported in tvOS and not needed by our tests.
--    excl += ["test/core/util/subprocess_posix.cc"]
--    return [file for file in out if not file in excl]
--
--  def end2end_tests_files(libs):
--    out = grpc_lib_files(libs, ("end2end_tests",), ("src", "headers"))
--    excl = grpc_private_files(libs)
--    return [file for file in out if not file in excl]
-+  <%
-+  lib_maps = {lib.name: lib for lib in libs}
- 
-   def ruby_multiline_list(files, indent):
-     return (',\n' + indent*' ').join('\'%s\'' % f for f in files)
-+
-+  def is_absl_lib(target_name):
-+    return target_name.startswith("absl/")
-+
-+  def get_absl_spec_name(label):
-+    # e.g. absl/apple:banana -> abseil/apple/banana
-+    return "abseil/" + label[5:].replace(":", "/")
-+
-+  def lib_and_transitive_deps(lib):
-+    return list(sorted(set({lib} | lib_maps[lib].transitive_deps)))
-+
-+  def non_abseil_lib_and_transitive_deps(lib):
-+    return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)]
-+
-+  def list_abseil_specs(lib):
-+    # This returns a list of abseil specs which the given lib and
-+    # its non-abseil transitive dependencies depend on.
-+    # As a result, internal abseil libraries are excluded from the result.
-+    absl_specs = set()
-+    for lib_name in lib_and_transitive_deps(lib):
-+      if is_absl_lib(lib_name): continue
-+      for dep in lib_maps[lib_name].deps:
-+        if is_absl_lib(dep):
-+          absl_specs.add(get_absl_spec_name(dep))
-+    return list(sorted(absl_specs))
-+
-+  def list_lib_files(lib, fields):
-+    files = set()
-+    for lib_name in non_abseil_lib_and_transitive_deps(lib):
-+      lib = lib_maps[lib_name]
-+      for field in fields:
-+        files.update(lib.get(field, []))
-+    return list(sorted(files))
-+
-+  grpc_private_files = list_lib_files("grpc", ("headers", "src"))
-+  grpc_public_headers = list_lib_files("grpc", ("public_headers",))
-+  grpc_private_headers = list_lib_files("grpc", ("headers",))
-+  grpc_abseil_specs = list_abseil_specs("grpc")
-+
-+  grpc_cronet_files = list(sorted(
-+    set(list_lib_files("grpc_cronet", ("src", "headers")))
-+    - set(grpc_private_files)
-+    - set([
-+      # We do not need cronet dedicated plugin registry
-+      "src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc",
-+      # We do not need dummy cronet API for ObjC
-+      "src/core/ext/transport/cronet/transport/cronet_api_dummy.cc",
-+    ])))
-+  grpc_cronet_public_headers = list(sorted(
-+    set(list_lib_files("grpc_cronet", ("public_headers",)))
-+    - set(grpc_public_headers)))
-+
-+  grpc_test_util_files = list(sorted(
-+    set(list_lib_files("end2end_tests", ("src", "headers")))
-+    - set(grpc_private_files)
-+    - set([
-+      # Subprocess is not supported in tvOS and not needed by our tests.
-+      "test/core/util/subprocess_posix.cc",
-+    ])))
-   %>
-   Pod::Spec.new do |s|
-     s.name     = 'gRPC-Core'
-@@ -152,7 +162,7 @@
-     }
- 
-     s.default_subspecs = 'Interface', 'Implementation'
--    s.compiler_flags = '-DGRPC_ARES=0'
-+    s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma'
-     s.libraries = 'c++'
- 
-     # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
-@@ -168,18 +178,21 @@
-     s.subspec 'Interface' do |ss|
-       ss.header_mappings_dir = 'include/grpc'
- 
--      ss.source_files = ${ruby_multiline_list(grpc_public_headers(libs), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpc_public_headers, 22)}
-     end
-     s.subspec 'Implementation' do |ss|
-       ss.header_mappings_dir = '.'
-       ss.libraries = 'z'
-       ss.dependency "#{s.name}/Interface", version
-       ss.dependency 'BoringSSL-GRPC', '0.0.5'
-+      abseil_version = '0.20190808.1'
-+      % for abseil_spec in grpc_abseil_specs:
-+      ss.dependency '${abseil_spec}', abseil_version
-+      % endfor
-       ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'
- 
--      ss.source_files = ${ruby_multiline_list(grpc_private_files(libs), 22)}
--
--      ss.private_header_files = ${ruby_multiline_list(grpc_private_headers(libs), 30)}
-+      ss.source_files = ${ruby_multiline_list(grpc_private_files, 22)}
-+      ss.private_header_files = ${ruby_multiline_list(grpc_private_headers, 30)}
-     end
- 
-     # CFStream is now default. Leaving this subspec only for compatibility purpose.
-@@ -189,7 +202,7 @@
- 
-     s.subspec 'Cronet-Interface' do |ss|
-       ss.header_mappings_dir = 'include/grpc'
--      ss.source_files = ${ruby_multiline_list(grpc_cronet_public_headers(libs), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpc_cronet_public_headers, 22)}
-     end
- 
-     s.subspec 'Cronet-Implementation' do |ss|
-@@ -199,7 +212,7 @@
-       ss.dependency "#{s.name}/Implementation", version
-       ss.dependency "#{s.name}/Cronet-Interface", version
- 
--      ss.source_files = ${ruby_multiline_list(grpc_cronet_files(libs), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpc_cronet_files, 22)}
-     end
- 
-     s.subspec 'Tests' do |ss|
-@@ -208,8 +221,7 @@
-       ss.dependency "#{s.name}/Interface", version
-       ss.dependency "#{s.name}/Implementation", version
- 
--      ss.source_files = ${ruby_multiline_list(grpc_test_util_files(libs), 22)},
--                        ${ruby_multiline_list(end2end_tests_files(libs), 22)}
-+      ss.source_files = ${ruby_multiline_list(grpc_test_util_files, 22)}
-     end
- 
-     # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
diff --git a/grpc-1.26.0-core-tests-link-errors.patch b/grpc-1.26.0-core-tests-link-errors.patch
deleted file mode 100644
index 48e6521..0000000
--- a/grpc-1.26.0-core-tests-link-errors.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur grpc-1.26.0-original/CMakeLists.txt grpc-1.26.0/CMakeLists.txt
---- grpc-1.26.0-original/CMakeLists.txt	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/CMakeLists.txt	2021-03-15 09:17:35.873493405 -0400
-@@ -2609,6 +2609,7 @@
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   gpr
-   grpc_unsecure
-+  grpc
-   upb
- )
- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
diff --git a/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch b/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch
deleted file mode 100644
index 2a90d4f..0000000
--- a/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/setup.py grpc-1.26.0/src/python/grpcio_tests/setup.py
---- grpc-1.26.0-original/src/python/grpcio_tests/setup.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/src/python/grpcio_tests/setup.py	2021-02-02 09:11:20.236194502 -0500
-@@ -37,7 +37,7 @@
- }
- 
- INSTALL_REQUIRES = (
--    'coverage>=4.0', 'enum34>=1.0.4',
-+    'coverage>=4.0',
-     'grpcio>={version}'.format(version=grpc_version.VERSION),
-     'grpcio-channelz>={version}'.format(version=grpc_version.VERSION),
-     'grpcio-status>={version}'.format(version=grpc_version.VERSION),
-@@ -48,6 +48,8 @@
- 
- if not PY3:
-     INSTALL_REQUIRES += ('futures>=2.2.0',)
-+if sys.version_info < (3, 4):
-+    INSTALL_REQUIRES += ('enum34>=1.0.4',)
- 
- COMMAND_CLASS = {
-     # Run `preprocess` *before* doing any packaging!
diff --git a/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch b/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch
deleted file mode 100644
index a9307dd..0000000
--- a/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py grpc-1.26.0/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py
---- grpc-1.26.0-original/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py	2021-03-15 10:09:54.802317262 -0400
-@@ -13,6 +13,7 @@
- # limitations under the License.
- """Secure client-server interoperability as a unit test."""
- 
-+import os
- import unittest
- 
- import grpc
-@@ -29,6 +30,8 @@
- class SecureIntraopTest(_intraop_test_case.IntraopTestCase, unittest.TestCase):
- 
-     def setUp(self):
-+        if 'FEDORA_NO_NETWORK_TESTS' in os.environ:
-+            self.skipTest('Network tests disabled')
-         self.server = test_common.test_server()
-         test_pb2_grpc.add_TestServiceServicer_to_server(service.TestService(),
-                                                         self.server)
-diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py grpc-1.26.0/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py
---- grpc-1.26.0-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py	2021-03-15 10:08:08.159649736 -0400
-@@ -13,6 +13,7 @@
- # limitations under the License.
- """Tests for an actual dns resolution."""
- 
-+import os
- import unittest
- import logging
- import six
-@@ -45,6 +46,8 @@
-     def tearDown(self):
-         self._server.stop(None)
- 
-+    @unittest.skipIf('FEDORA_NO_NETWORK_TESTS' in os.environ,
-+                     'Network tests disabled')
-     def test_connect_loopback(self):
-         # NOTE(https://github.com/grpc/grpc/issues/18422)
-         # In short, Gevent + C-Ares = Segfault. The C-Ares driver is not
diff --git a/grpc-1.26.0-python-SyntaxWarning.patch b/grpc-1.26.0-python-SyntaxWarning.patch
deleted file mode 100644
index 1509310..0000000
--- a/grpc-1.26.0-python-SyntaxWarning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Backport upstream commit 9e0b427893b65b220faf8a31a6afdc67f6f41364 “Use != with literals”
-
-diff -Naur grpc-1.26.0-original/src/python/grpcio/commands.py grpc-1.26.0/src/python/grpcio/commands.py
---- grpc-1.26.0-original/src/python/grpcio/commands.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/src/python/grpcio/commands.py	2021-01-28 12:51:33.635142522 -0500
-@@ -99,7 +99,7 @@
-         target_dir = os.path.join(GRPC_STEM, 'doc', 'build')
-         exit_code = sphinx.cmd.build.build_main(
-             ['-b', 'html', '-W', '--keep-going', source_dir, target_dir])
--        if exit_code is not 0:
-+        if exit_code:
-             raise CommandError(
-                 "Documentation generation has warnings or errors")
- 
diff --git a/grpc-1.26.0-python-grpcio_tests-fixture-super.patch b/grpc-1.26.0-python-grpcio_tests-fixture-super.patch
deleted file mode 100644
index ed99b1c..0000000
--- a/grpc-1.26.0-python-grpcio_tests-fixture-super.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py grpc-1.26.0/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py
---- grpc-1.26.0-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py	2021-03-15 09:15:08.419558680 -0400
-@@ -235,8 +235,7 @@
- 
-     def setUp(self):
-         self._thread_pool = thread_pool.RecordingThreadPool(max_workers=None)
--        super(HealthServicerTest, self).start_server(
--            non_blocking=True, thread_pool=self._thread_pool)
-+        super().start_server(non_blocking=True, thread_pool=self._thread_pool)
- 
-     def test_check_empty_service(self):
-         request = health_pb2.HealthCheckRequest()
-@@ -273,8 +272,7 @@
- class HealthServicerBackwardsCompatibleWatchTest(BaseWatchTests.WatchTests):
- 
-     def setUp(self):
--        super(HealthServicerBackwardsCompatibleWatchTest, self).start_server(
--            non_blocking=False, thread_pool=None)
-+        super().start_server(non_blocking=False, thread_pool=None)
- 
- 
- if __name__ == '__main__':
diff --git a/grpc-1.36.4-python-grpcio_tests-fixture-super.patch b/grpc-1.36.4-python-grpcio_tests-fixture-super.patch
new file mode 100644
index 0000000..098df22
--- /dev/null
+++ b/grpc-1.36.4-python-grpcio_tests-fixture-super.patch
@@ -0,0 +1,45 @@
+diff -Naur grpc-1.36.4-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py grpc-1.36.4/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py
+--- grpc-1.36.4-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py	2021-03-17 15:59:05.000000000 -0400
++++ grpc-1.36.4/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py	2021-03-22 16:39:05.558398948 -0400
+@@ -234,9 +234,7 @@
+ 
+     def setUp(self):
+         self._thread_pool = thread_pool.RecordingThreadPool(max_workers=None)
+-        super(HealthServicerTest,
+-              self).start_server(non_blocking=True,
+-                                 thread_pool=self._thread_pool)
++        super().start_server(non_blocking=True, thread_pool=self._thread_pool)
+ 
+     def test_check_empty_service(self):
+         request = health_pb2.HealthCheckRequest()
+@@ -273,8 +271,7 @@
+ class HealthServicerBackwardsCompatibleWatchTest(BaseWatchTests.WatchTests):
+ 
+     def setUp(self):
+-        super(HealthServicerBackwardsCompatibleWatchTest,
+-              self).start_server(non_blocking=False, thread_pool=None)
++        super().start_server(non_blocking=False, thread_pool=None)
+ 
+ 
+ if __name__ == '__main__':
+diff -Naur grpc-1.36.4-original/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py grpc-1.36.4/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py
+--- grpc-1.36.4-original/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py	2021-03-17 15:59:05.000000000 -0400
++++ grpc-1.36.4/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py	2021-03-22 16:39:05.559398954 -0400
+@@ -532,7 +532,7 @@
+                 request_iterator, context)
+ 
+     def setUp(self):
+-        super(SimpleStubsPluginTest, self).setUp()
++        super().setUp()
+         self._server = test_common.test_server()
+         service_pb2_grpc.add_TestServiceServicer_to_server(
+             self.Servicer(), self._server)
+@@ -542,7 +542,7 @@
+ 
+     def tearDown(self):
+         self._server.stop(None)
+-        super(SimpleStubsPluginTest, self).tearDown()
++        super().tearDown()
+ 
+     def testUnaryCall(self):
+         request = request_pb2.SimpleRequest(response_size=13)
diff --git a/grpc-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch b/grpc-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch
new file mode 100644
index 0000000..9ff78a2
--- /dev/null
+++ b/grpc-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch
@@ -0,0 +1,20 @@
+diff -Naur grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py grpc-1.36.4/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py
+--- grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py	2021-03-17 15:59:05.000000000 -0400
++++ grpc-1.36.4/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py	2021-03-22 16:43:35.697100185 -0400
+@@ -13,6 +13,7 @@
+ # limitations under the License.
+ """Tests for an actual dns resolution."""
+ 
++import os
+ import unittest
+ import logging
+ import six
+@@ -45,6 +46,8 @@
+     def tearDown(self):
+         self._server.stop(None)
+ 
++    @unittest.skipIf('FEDORA_NO_NETWORK_TESTS' in os.environ,
++                     'Network tests disabled')
+     def test_connect_loopback(self):
+         # NOTE(https://github.com/grpc/grpc/issues/18422)
+         # In short, Gevent + C-Ares = Segfault. The C-Ares driver is not
diff --git a/grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch b/grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch
similarity index 65%
rename from grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch
rename to grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch
index 08f1892..82b7cc5 100644
--- a/grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch
+++ b/grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch
@@ -1,6 +1,6 @@
-diff -Naur grpc-1.36.0-original/src/python/grpcio_tests/tests/unit/_compression_test.py grpc-1.36.0/src/python/grpcio_tests/tests/unit/_compression_test.py
---- grpc-1.36.0-original/src/python/grpcio_tests/tests/unit/_compression_test.py	2021-02-23 16:34:43.000000000 -0500
-+++ grpc-1.36.0/src/python/grpcio_tests/tests/unit/_compression_test.py	2021-03-03 09:41:03.076816980 -0500
+diff -Naur grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_compression_test.py grpc-1.36.4/src/python/grpcio_tests/tests/unit/_compression_test.py
+--- grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_compression_test.py	2021-03-17 15:59:05.000000000 -0400
++++ grpc-1.36.4/src/python/grpcio_tests/tests/unit/_compression_test.py	2021-03-22 16:46:55.555358822 -0400
 @@ -318,6 +318,7 @@
          else:
              self.assertNotCompressed(received_ratio)
diff --git a/grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch b/grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
new file mode 100644
index 0000000..70b0abc
--- /dev/null
+++ b/grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
@@ -0,0 +1,50 @@
+diff -Naur grpc-1.37.1-original/CMakeLists.txt grpc-1.37.1/CMakeLists.txt
+--- grpc-1.37.1-original/CMakeLists.txt	2021-04-27 18:01:25.000000000 -0400
++++ grpc-1.37.1/CMakeLists.txt	2021-05-04 11:00:04.934427672 -0400
+@@ -3294,10 +3294,6 @@
+     ${_gRPC_UPB_INCLUDE_DIR}
+     ${_gRPC_XXHASH_INCLUDE_DIR}
+     ${_gRPC_ZLIB_INCLUDE_DIR}
+-    third_party/googletest/googletest/include
+-    third_party/googletest/googletest
+-    third_party/googletest/googlemock/include
+-    third_party/googletest/googlemock
+     ${_gRPC_PROTO_GENS_DIR}
+ )
+ target_link_libraries(grpc++_test_config
+@@ -10669,7 +10665,6 @@
+ 
+ 
+ endif()
+-if(gRPC_BUILD_TESTS)
+ 
+ add_executable(grpc_cli
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc
+@@ -10683,8 +10678,6 @@
+   test/cpp/util/proto_file_parser.cc
+   test/cpp/util/proto_reflection_descriptor_database.cc
+   test/cpp/util/service_describer.cc
+-  third_party/googletest/googletest/src/gtest-all.cc
+-  third_party/googletest/googlemock/src/gmock-all.cc
+ )
+ 
+ target_include_directories(grpc_cli
+@@ -10699,10 +10692,6 @@
+     ${_gRPC_UPB_INCLUDE_DIR}
+     ${_gRPC_XXHASH_INCLUDE_DIR}
+     ${_gRPC_ZLIB_INCLUDE_DIR}
+-    third_party/googletest/googletest/include
+-    third_party/googletest/googletest
+-    third_party/googletest/googlemock/include
+-    third_party/googletest/googlemock
+     ${_gRPC_PROTO_GENS_DIR}
+ )
+ 
+@@ -10715,7 +10704,6 @@
+ )
+ 
+ 
+-endif()
+ if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN)
+ 
+ add_executable(grpc_cpp_plugin
diff --git a/grpc-1.37.0-importlib-abc-python3.10.patch b/grpc-1.37.0-importlib-abc-python3.10.patch
new file mode 100644
index 0000000..37c5da7
--- /dev/null
+++ b/grpc-1.37.0-importlib-abc-python3.10.patch
@@ -0,0 +1,11 @@
+diff -Naur grpc-1.37.0-original/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py grpc-1.37.0/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
+--- grpc-1.37.0-original/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py	2021-04-06 18:48:56.000000000 -0400
++++ grpc-1.37.0/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py	2021-04-22 15:45:59.234743676 -0400
+@@ -42,6 +42,7 @@
+ if sys.version_info >= (3, 5, 0):
+     import contextlib
+     import importlib
++    import importlib.abc
+     import importlib.machinery
+     import threading
+ 
diff --git a/grpc-1.37.0-python-grpcio-use-system-abseil.patch b/grpc-1.37.0-python-grpcio-use-system-abseil.patch
new file mode 100644
index 0000000..fef50aa
--- /dev/null
+++ b/grpc-1.37.0-python-grpcio-use-system-abseil.patch
@@ -0,0 +1,45 @@
+diff -Naur grpc-1.37.0-original/setup.py grpc-1.37.0/setup.py
+--- grpc-1.37.0-original/setup.py	2021-04-06 18:48:56.000000000 -0400
++++ grpc-1.37.0/setup.py	2021-04-08 15:34:35.182802019 -0400
+@@ -28,6 +28,7 @@
+ from distutils import util
+ import os
+ import os.path
++import pathlib
+ import pkg_resources
+ import platform
+ import re
+@@ -154,6 +155,11 @@
+ # runtime, the shared library must be installed
+ BUILD_WITH_SYSTEM_RE2 = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_RE2', 'False')
+ 
++# Export this variable to use the system installation of abseil. You need to
++# have the header files installed (in /usr/include/absl) and during
++# runtime, the shared library must be installed
++BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL', False)
++
+ # Export this variable to force building the python extension with a statically linked libstdc++.
+ # At least on linux, this is normally not needed as we can build manylinux-compatible wheels on linux just fine
+ # without statically linking libstdc++ (which leads to a slight increase in the wheel size).
+@@ -296,6 +302,10 @@
+     CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES)
+     RE2_INCLUDE = (os.path.join('/usr', 'include', 're2'),)
+ 
++if BUILD_WITH_SYSTEM_ABSL:
++    CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x, CORE_C_FILES)
++    ABSL_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE +
+                                  ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
+                                  RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
+@@ -325,6 +335,10 @@
+     EXTENSION_LIBRARIES += ('cares',)
+ if BUILD_WITH_SYSTEM_RE2:
+     EXTENSION_LIBRARIES += ('re2',)
++if BUILD_WITH_SYSTEM_ABSL:
++    EXTENSION_LIBRARIES += tuple(
++        lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so')
++    )
+ 
+ DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
+ asm_files = []
diff --git a/grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch b/grpc-1.37.0-python-grpcio_tools-use-system-protobuf.patch
similarity index 72%
rename from grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch
rename to grpc-1.37.0-python-grpcio_tools-use-system-protobuf.patch
index 6b42770..832f1d9 100644
--- a/grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch
+++ b/grpc-1.37.0-python-grpcio_tools-use-system-protobuf.patch
@@ -1,11 +1,11 @@
-diff -Naur grpc-1.26.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py grpc-1.26.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
---- grpc-1.26.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py	2019-12-17 20:29:27.000000000 -0500
-+++ grpc-1.26.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py	2021-01-29 09:37:57.182365074 -0500
+diff -Naur grpc-1.37.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py grpc-1.37.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+--- grpc-1.37.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py	2021-04-06 18:48:56.000000000 -0400
++++ grpc-1.37.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py	2021-04-08 15:30:28.142459012 -0400
 @@ -14,10 +14,9 @@
  # limitations under the License.
  
  # AUTO-GENERATED BY make_grpcio_tools.py!
--CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/parse_context.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/io_win32.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/implicit_weak_message.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arena.cc', 'google/protobuf/any_lite.cc']
+-CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/parse_context.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/map.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/io_win32.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/implicit_weak_message.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/generated_enum_util.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', 'google/protobuf/arena.cc', 'google/protobuf/any_lite.cc']
 +# Then, modified by hand to build with an external system protobuf installation.
 +CC_FILES=[]
  PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', 'google/protobuf/api.proto', 'google/protobuf/any.proto']
@@ -13,6 +13,6 @@ diff -Naur grpc-1.26.0-original/tools/distrib/python/grpcio_tools/protoc_lib_dep
 -CC_INCLUDE='third_party/protobuf/src'
 -PROTO_INCLUDE='third_party/protobuf/src'
 -
--PROTOBUF_SUBMODULE_VERSION="09745575a923640154bcf307fba8aedff47f240a"
+-PROTOBUF_SUBMODULE_VERSION="d7e943b8d2bc444a8c770644e73d090b486f8b37"
 +CC_INCLUDE='/usr/include'
 +PROTO_INCLUDE='/usr/include'
diff --git a/grpc-1.37.0-unbundle-xxhash.patch b/grpc-1.37.0-unbundle-xxhash.patch
new file mode 100644
index 0000000..c2ea14f
--- /dev/null
+++ b/grpc-1.37.0-unbundle-xxhash.patch
@@ -0,0 +1,24 @@
+diff -Naur grpc-1.37.0-original/cmake/xxhash.cmake grpc-1.37.0/cmake/xxhash.cmake
+--- grpc-1.37.0-original/cmake/xxhash.cmake	2021-04-06 18:48:56.000000000 -0400
++++ grpc-1.37.0/cmake/xxhash.cmake	2021-04-08 15:57:39.157042527 -0400
+@@ -12,4 +12,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-set(_gRPC_XXHASH_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/xxhash")
++pkg_search_module(XXHASH REQUIRED libxxhash)
++set(_gRPC_XXHASH_INCLUDE_DIR "${XXHASH_INCLUDEDIR}")
++set(_gRPC_XXHASH_LIBRARIES "${XXHASH_LIBRARIES}")
+diff -Naur grpc-1.37.0-original/CMakeLists.txt grpc-1.37.0/CMakeLists.txt
+--- grpc-1.37.0-original/CMakeLists.txt	2021-04-06 18:48:56.000000000 -0400
++++ grpc-1.37.0/CMakeLists.txt	2021-04-08 15:53:39.462854440 -0400
+@@ -262,7 +262,8 @@
+ elseif(_gRPC_PLATFORM_ANDROID)
+   set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m)
+ elseif(UNIX)
+-  set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread)
++  set(_gRPC_ALLTARGETS_LIBRARIES
++      ${CMAKE_DL_LIBS} rt m pthread ${_gRPC_XXHASH_LIBRARIES})
+ endif()
+ 
+ if(WIN32)
diff --git a/grpc.rpmlintrc b/grpc.rpmlintrc
index 5f9e915..81e601f 100644
--- a/grpc.rpmlintrc
+++ b/grpc.rpmlintrc
@@ -14,3 +14,13 @@ addFilter(r' no-documentation')
 addFilter(r' crypto-policy-non-compliance-openssl .* SSL_CTX_set_cipher_list')
 # These will not dangle after the ca-certificates dependency is installed:
 addFilter(r' dangling-relative-symlink .*\.pem$')
+# We do not really have a way to work around this. It should be okay in
+# practice. Hopefully the grpc_cli executable will become disentangled from the
+# test libraries upstream and this will go away.
+addFilter(r' shared-lib-without-dependency-information '
+          r'/.*libgrpc.._error_details\.so')
+# There is nothing to document for these; they do not have --help output and
+# are intended for program use.
+addFilter(r' no-manual-page-for-binary grpc_.*_plugin$')
+# There is really no version information available.
+addFilter(r' unversioned-explicit-provides bundled\(upb\)')
diff --git a/grpc.spec b/grpc.spec
index 757bc9b..3c3232a 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -1,5 +1,6 @@
-# In gtest 1.36, we must link against the system abseil-cpp. We get linker
-# errors here if we are not using C++17.
+# We need to use C++17 to link against the system abseil-cpp, or we get linker
+# errors.
+%global cpp_std 17
 
 # However, gtest in Fedora uses the C++11 ABI, so we get linker errors building
 # the tests if we use C++17. We must therefore bundle a copy of gtest in the
@@ -7,13 +8,12 @@
 # there is no alternative in this case. It is not treated as a bundled library
 # because it is used only at build time, and is not installed.
 %global gtest_version 1.10.0
-%bcond_without system_gtest
+%bcond_with system_gtest
 
-# The CMake build works, except grpc_cli is only built with the tests.
-%bcond_with cmake
-
-# Note that, in this spec file, building the tests requires using CMake.
-%bcond_with core_tests
+# This must be enabled to get grpc_cli, which is apparently considered part of
+# the tests by upstream. This is mentioned in
+# https://github.com/grpc/grpc/issues/23432.
+%bcond_without core_tests
 
 # A few failing Python “test_lite” tests are skipped without understanding.
 # This lets us easily re-enable them to try to work toward a fix or a useful
@@ -28,12 +28,12 @@
 %bcond_with python_gevent_tests
 
 Name:           grpc
-Version:        1.26.0
-Release:        15%{?dist}
+Version:        1.37.1
+Release:        1%{?dist}
 Summary:        RPC library and framework
 
 # CMakeLists.txt: gRPC_CORE_SOVERSION
-%global c_so_version 9
+%global c_so_version 15
 # CMakeLists.txt: gRPC_CPP_SOVERSION
 %global cpp_so_version 1
 # CMakeLists.txt: gRPC_CSHARP_SOVERSION
@@ -62,7 +62,8 @@ Summary:        RPC library and framework
 #   - src/boringssl/crypto_test_data.cc and src/boringssl/err_data.c
 #     * Removed in prep; not used when building with system OpenSSL
 # BSD:
-#   - src/objective-c/*.podspec and templates/src/objective-c/*.podspec.template
+#   - src/objective-c/*.podspec and
+#     templates/src/objective-c/*.podspec.template
 #     * Unused since the Objective-C bindings are not currently built
 # MIT:
 #   - third_party/cares/ares_build.h
@@ -81,45 +82,50 @@ Source0:        %{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz
 %global gtest_archivename googletest-release-%{gtest_version}
 Source1:        https://github.com/google/googletest/archive/release-%{gtest_version}/%{gtest_archivename}.tar.gz
 
+# Downstream grpc_cli man pages; hand-written based on “grpc_cli help” output.
+Source100:      %{name}_cli.1
+Source101:      %{name}_cli-ls.1
+Source102:      %{name}_cli-call.1
+Source103:      %{name}_cli-type.1
+Source104:      %{name}_cli-parse.1
+Source105:      %{name}_cli-totext.1
+Source106:      %{name}_cli-tojson.1
+Source107:      %{name}_cli-tobinary.1
+Source108:      %{name}_cli-help.1
+
 # ~~~~ C (core) and C++ (cpp) ~~~~
 
 BuildRequires:  gcc-c++
-%if %{with cmake}
 BuildRequires:  cmake
 BuildRequires:  ninja-build
-%else
-BuildRequires:  make
-%endif
+%if %{with core_tests}
+# Used on grpc_cli:
 BuildRequires:  chrpath
+%endif
 
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  cmake(gflags)
 BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  protobuf-compiler
-
+BuildRequires:  pkgconfig(re2)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  cmake(c-ares)
+BuildRequires:  abseil-cpp-devel
+BuildRequires:  pkgconfig(libxxhash)
+# Header-only C library, which we unbundle from the bundled copy of upb
+BuildRequires:  wyhash_final1-devel
+BuildRequires:  wyhash_final1-static
 
 %if %{with core_tests}
 BuildRequires:  cmake(benchmark)
 %if %{with system_gtest}
 BuildRequires:  cmake(gtest)
 BuildRequires:  pkgconfig(gmock)
-BuildRequires:  pkgconfig(libprofiler)
 %endif
 %endif
 
 # ~~~~ Python ~~~~
 
-%global set_grpc_python_environment %{expand:
-export GRPC_PYTHON_BUILD_WITH_CYTHON='True'
-export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL='True'
-export GRPC_PYTHON_BUILD_SYSTEM_ZLIB='True'
-export GRPC_PYTHON_BUILD_SYSTEM_CARES='True'
-export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY='True'
-export GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD='True'
-}
-
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 
@@ -183,6 +189,9 @@ BuildRequires:  python3dist(requests) >= 2.4.12
 # Required for “test_gevent” tests:
 BuildRequires:  python3dist(gevent)
 
+# For stopping the port server
+BuildRequires:  curl
+
 # ~~~~ Miscellaneous ~~~~
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1893533
@@ -201,38 +210,36 @@ BuildRequires:  dos2unix
 # is not suitable for upstream.
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/CryptoPolicies/#_cc_applications
 Patch0:         %{name}-0001-enforce-system-crypto-policies.patch
-# Make gRPC podspec template more robust
-# https://github.com/grpc/grpc/pull/21445
-Patch3:         99f8a10aec994a8957fbb6787768b444ef34d6a2.patch
-# Remove grpc sources from grpc++
-# https://github.com/grpc/grpc/pull/21662
-Patch4:         72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch
-# Backport upstream commit 9e0b427893b65b220faf8a31a6afdc67f6f41364 “Use !=
-# with literals”
-Patch6:         %{name}-1.26.0-python-SyntaxWarning.patch
 # Build python3-grpcio_tools against system protobuf packages instead of
 # expecting a git submodule. Must also add requisite linker flags using
 # GRPC_PYTHON_LDFLAGS.
-Patch8:         %{name}-1.26.0-python-grpcio_tools-use-system-protobuf.patch
-# In grpcio-tests, require enum34 for install only on those ancient Pythons
-# that require it; we are not using such a Python!
-Patch10:        %{name}-1.26.0-grpcio-tests-conditionalize-enum34.patch
+Patch1:         %{name}-1.37.0-python-grpcio_tools-use-system-protobuf.patch
+# Add an option GRPC_PYTHON_BUILD_SYSTEM_ABSL to go with the gRPC_ABSL_PROVIDER
+# option already provided upstream. See
+# https://github.com/grpc/grpc/issues/25559.
+Patch2:         %{name}-1.37.0-python-grpcio-use-system-abseil.patch
 # Fix errors like:
 #   TypeError: super(type, obj): obj must be an instance or subtype of type
 # It is not clear why these occur.
-Patch11:        %{name}-1.26.0-python-grpcio_tests-fixture-super.patch
+Patch3:         %{name}-1.36.4-python-grpcio_tests-fixture-super.patch
 # Skip tests requiring non-loopback network access when the
 # FEDORA_NO_NETWORK_TESTS environment variable is set.
-Patch12:        %{name}-1.26.0-grpcio_tests-make-network-tests-skippable.patch
-# Fix link errors in the core tests: the test library grpc_test_util_unsecure
-# does require the “secure” library “grpc”
-Patch13:        %{name}-1.26.0-core-tests-link-errors.patch
+Patch4:         %{name}-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch
 # A handful of compression tests miss the compression ratio threshold. It seems
 # to be inconsistent which particular combinations fail in a particular test
 # run. It is not clear that this is a real problem. Any help in understanding
 # the actual cause well enough to fix this or usefully report it upstream is
 # welcome.
-Patch14:        %{name}-1.36.0-python-grpcio_tests-skip-compression-tests.patch
+Patch5:         %{name}-1.36.4-python-grpcio_tests-skip-compression-tests.patch
+# The upstream requirement to link gtest/gmock from grpc_cli is spurious.
+# Remove it. We still have to build the core tests and link a test library
+# (libgrpc++_test_config.so…)
+Patch6:         %{name}-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
+# https://github.com/grpc/grpc/issues/25945
+Patch7:         %{name}-1.37.0-unbundle-xxhash.patch
+# In Python 3.10, “import importlib” does not implicitly import importlib.abc.
+# See https://github.com/grpc/grpc/issues/26062.
+Patch8:         %{name}-1.37.0-importlib-abc-python3.10.patch
 
 Requires:       %{name}-data = %{version}-%{release}
 
@@ -240,7 +247,8 @@ Requires:       %{name}-data = %{version}-%{release}
 # with anything other than Bazel, and Bazel is not likely to make it into
 # Fedora anytime soon due to its nightmarish collection of dependencies.
 # Monitor this at https://bugzilla.redhat.com/show_bug.cgi?id=1470842.
-# Therefore upb cannot be packaged for Fedora, and we must use the bundled copy.
+# Therefore upb cannot be packaged for Fedora, and we must use the bundled
+# copy.
 #
 # Note that upstream has never chosen a version, and it is not clear from which
 # commit the bundled copy was taken or forked.
@@ -266,7 +274,8 @@ connect devices, mobile applications and browsers to backend services.
 
 The main usage scenarios:
 
-  • Efficiently connecting polyglot services in microservices style architecture
+  • Efficiently connecting polyglot services in microservices style
+    architecture
   • Connecting mobile devices, browser clients to backend services
   • Generating efficient client libraries
 
@@ -370,8 +379,25 @@ Summary:        Development files for gRPC library
 # License:        same as base package
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-cpp%{?_isa} = %{version}-%{release}
+
 Requires:       cmake-filesystem
 
+# grpc/impl/codegen/port_platform.h includes linux/version.h
+Requires:       kernel-headers%{?_isa}
+# grpcpp/impl/codegen/config_protobuf.h includes google/protobuf/…
+Requires:       pkgconfig(protobuf)
+# grpcpp/test/mock_stream.h includes gmock/gmock.h
+Requires:       pkgconfig(gmock)
+# grpcpp/impl/codegen/sync.h includes absl/synchronization/mutex.h
+# grpc.pc has -labsl_[…]
+Requires:       abseil-cpp-devel%{?_isa}
+# grpc.pc has -lre2
+Requires:       pkgconfig(re2)
+# grpc.pc has -lcares
+Requires:       cmake(c-ares)
+# grpc.pc has -lz
+Requires:       pkgconfig(zlib)
+
 %description devel
 Development headers and files for gRPC libraries (both C and C++).
 
@@ -379,9 +405,6 @@ Development headers and files for gRPC libraries (both C and C++).
 %package -n python3-grpcio
 Summary:        Python language bindings for gRPC
 # License:        same as base package
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio
-%endif
 
 # Note that the Python package has no runtime dependency on the base C library;
 # everything it needs is bundled.
@@ -394,9 +417,6 @@ Python language bindings for gRPC (HTTP/2-based RPC framework).
 %package -n python3-grpcio-tools
 Summary:       Package for gRPC Python tools
 # License:        same as base package
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-tools
-%endif
 
 %description -n python3-grpcio-tools
 Package for gRPC Python tools.
@@ -406,9 +426,6 @@ Package for gRPC Python tools.
 Summary:        Channel Level Live Debug Information Service for gRPC
 License:        ASL 2.0
 BuildArch:      noarch
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-channelz
-%endif
 
 %description -n python3-grpcio-channelz
 Channelz is a live debug tool in gRPC Python.
@@ -418,9 +435,6 @@ Channelz is a live debug tool in gRPC Python.
 Summary:        Standard Health Checking Service for gRPC
 License:        ASL 2.0
 BuildArch:      noarch
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-health-checking
-%endif
 
 %description -n python3-grpcio-health-checking
 Reference package for GRPC Python health checking.
@@ -430,9 +444,6 @@ Reference package for GRPC Python health checking.
 Summary:        Standard Protobuf Reflection Service for gRPC
 License:        ASL 2.0
 BuildArch:      noarch
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-reflections
-%endif
 
 %description -n python3-grpcio-reflection
 Reference package for reflection in GRPC Python.
@@ -442,9 +453,6 @@ Reference package for reflection in GRPC Python.
 Summary:        Status proto mapping for gRPC
 License:        ASL 2.0
 BuildArch:      noarch
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-status
-%endif
 
 %description -n python3-grpcio-status
 Reference package for GRPC Python status proto mapping.
@@ -454,9 +462,6 @@ Reference package for GRPC Python status proto mapping.
 Summary:        Testing utilities for gRPC Python
 License:        ASL 2.0
 BuildArch:      noarch
-%if 0%{?fedora} == 32
-%py_provides python3-grpcio-testing
-%endif
 
 %description -n python3-grpcio-testing
 Testing utilities for gRPC Python.
@@ -464,12 +469,6 @@ Testing utilities for gRPC Python.
 
 %prep
 %autosetup -p1
-%if %{without cmake}
-sed -i \
-    -e 's:^prefix ?= .*:prefix ?= %{_prefix}:' \
-    -e 's:$(prefix)/lib:$(prefix)/%{_lib}:' \
-    -e 's:^GTEST_LIB =.*::' Makefile
-%endif
 
 %if %{without system_gtest}
 # Copy in the needed gtest/gmock implementations.
@@ -498,12 +497,14 @@ sed -r -i 's/^([[:blank:]]*)(\$\{_gRPC_GFLAGS_LIBRARIES\})/'\
 '\1\2\n\1gtest\n\1gmock/' CMakeLists.txt
 %endif
 
-# Currently, the correct flags for linking against the gflags shared library
-# are silently not found. Since the gflags dependency goes away in a later
-# version of grpc, we just hack in the correct flags rather than taking the
-# time to fix it properly.
-sed -r -i 's/^([[:blank:]]*)(\$\{_gRPC_GFLAGS_LIBRARIES\})/'\
-'\1gflags_shared/' CMakeLists.txt
+# Remove bundled wyhash (via upb); to avoid patching the build system, simply
+# use a symlink to find the system copy. This is sufficient since it is a
+# header-only library.
+rm -rvf third_party/upb/third_party/wyhash
+ln -s %{_includedir}/wyhash_final1/ third_party/upb/third_party/wyhash
+
+# Remove bundled xxhash
+rm -rvf third_party/xxhash
 
 # Fix some of the weirdest accidentally-executable files
 find . -type f -name '*.md' -perm /0111 -execdir chmod -v a-x '{}' '+'
@@ -558,18 +559,33 @@ dos2unix \
     examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt
 # We leave those under examples/csharp alone.
 
+# We need to adjust the C++ standard to avoid abseil-related linker errors. For
+# the main C++ build, we can use CMAKE_CXX_STANDARD. For extensions, examples,
+# etc., we must patch.
+sed -r -i 's/(std=c\+\+)11/\1%{cpp_std}/g' \
+    setup.py %{name}.gyp Rakefile \
+    examples/cpp/*/Makefile \
+    examples/cpp/*/CMakeLists.txt \
+    tools/run_tests/artifacts/artifact_targets.py \
+    tools/distrib/python/grpcio_tools/setup.py
+
 # Fix the install path for .pc files
 # https://github.com/grpc/grpc/issues/25635
 sed -r -i 's|lib(/pkgconfig)|\${gRPC_INSTALL_LIBDIR}\1|' CMakeLists.txt
 
 %if %{without unexplained_failing_python_lite_tests}
-%ifarch %{arm32}
+# TODO figure out how to report this upstream in a useful/actionable way
+sed -r -i "s/^([[:blank:]]*)(def \
+test_immediately_connectable_channel_connectivity)\\b/\
+\\1@unittest.skip('May hang unexplainedly')\\n\\1\\2/" \
+    'src/python/grpcio_tests/tests/unit/_channel_connectivity_test.py'
+
+%ifarch %{ix86} %{arm32}
 # TODO figure out how to report this upstream in a useful/actionable way
 sed -r -i "s/^([[:blank:]]*)(def test_concurrent_stream_stream)\\b/\
 \\1@unittest.skip('May hang unexplainedly')\\n\\1\\2/" \
     'src/python/grpcio_tests/tests/testing/_client_test.py'
-%endif
-%ifarch %{ix86} %{arm32}
+
 # These tests fail with:
 #   OverflowError: Python int too large to convert to C ssize_t
 # TODO figure out how to report this upstream in a useful/actionable way
@@ -580,41 +596,47 @@ sed -r -i \
     'src/python/grpcio_tests/tests/unit/_session_cache_test.py'
 %endif
 
-# These will no longer be a problem on grpc 1.36:
-sed -r -i \
-    "s/^([[:blank:]]*)(class SecureServerSecureClient\(.*:)$/\
-\\1@unittest.skip('Unexplained hang')\\n\\1\\2/" \
-    'src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py'
-sed -r -i \
-    "s/^([[:blank:]]*)(def test_(stream_unary|unary_stream))\\b/\
-\\1@unittest.skip('Unexplained hang')\\n\\1\\2/" \
-    'src/python/grpcio_tests/tests/unit/beta/_beta_features_test.py'
-sed -r -i \
-    "s/^([[:blank:]]*)(def test(Secure(No|Client)Cert|SessionResumption))\\b/\
-\\1@unittest.skip('Invalid cert chain file')\\n\\1\\2/" \
-    'src/python/grpcio_tests/tests/unit/_auth_context_test.py'
-%ifnarch %{ix86} %{arm32}
-# (otherwise this was already done above)
-sed -r -i \
-    "s/^([[:blank:]]*)(def testSSLSessionCacheLRU)\\b/\
-\\1@unittest.skip('Invalid cert chain file')\\n\\1\\2/" \
-    'src/python/grpcio_tests/tests/unit/_session_cache_test.py'
+%ifarch s390x
+# Unexplained segmentation fault
+# TODO figure out how to report this upstream in a useful/actionable way
+sed -r -i "s/^([[:blank:]]*)(def test_start_xds_server)\\b/\
+\\1@unittest.skip('Unexplained segmentation fault')\\n\\1\\2/" \
+    'src/python/grpcio_tests/tests/unit/_xds_credentials_test.py'
 %endif
-sed -r -i \
-    "s/^([[:blank:]]*)(def test_(stream_stream|unary_unary|stub_context))\\b/\
-\\1@unittest.skip('Invalid cert chain file')\\n\\1\\2/" \
-    'src/python/grpcio_tests/tests/unit/beta/_beta_features_test.py'
+
+%if 0%{?fedora} > 34
+# Python 3.10 failures:
+
+# AssertionError: 'StatusCode.NOT_FOUND' not found in '<_InactiveRpcError of
+# RPC that terminated with:\n\tstatus = NOT_FOUND\n\tdetails = "Failed to get
+# the channel, please ensure your channel_id==10000 is
+# valid"\n\tdebug_error_string =
+# "{"created":"@1619130545.513500675","description":"Error received from peer
+# ipv6:[::1]:35867","file":"src/core/lib/surface/call.cc","file_line":1067,"grpc_message":"Failed
+# to get the channel, please ensure your channel_id==10000 is
+# valid","grpc_status":5}"\n>'
+#
+# AttributeError: 'NoneType' object has no attribute 'IsInitialized'
+sed -r -i "s/^([[:blank:]]*)(def test_invalid_query_get_\
+(channel|server(_sockets)?|socket|subchannel))\\b/\
+\\1@unittest.skip('Unexplained failure')\\n\\1\\2/" \
+    'src/python/grpcio_tests/tests/channelz/_channelz_servicer_test.py'
+%endif
+
 %endif
 
 
 %build
 # ~~~~ C (core) and C++ (cpp) ~~~~
 
-%if %{with cmake}
 # We could use either make or ninja as the backend; ninja is faster and has no
 # disadvantages (except a small additional BR, given we already need Python)
+#
+# We need to adjust the C++ standard to avoid abseil-related linker errors.
 %cmake \
     -DgRPC_INSTALL:BOOL=ON \
+    -DCMAKE_CXX_STANDARD:STRING=%{cpp_std} \
+    -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
     -DgRPC_INSTALL_BINDIR:PATH=%{_bindir} \
     -DgRPC_INSTALL_LIBDIR:PATH=%{_libdir} \
     -DgRPC_INSTALL_INCLUDEDIR:PATH=%{_includedir} \
@@ -626,11 +648,12 @@ sed -r -i \
     -DgRPC_BACKWARDS_COMPATIBILITY_MODE:BOOL=OFF \
     -DgRPC_ZLIB_PROVIDER:STRING='package' \
     -DgRPC_CARES_PROVIDER:STRING='package' \
+    -DgRPC_RE2_PROVIDER:STRING='package' \
     -DgRPC_SSL_PROVIDER:STRING='package' \
     -DgRPC_PROTOBUF_PROVIDER:STRING='package' \
     -DgRPC_PROTOBUF_PACKAGE_TYPE:STRING='MODULE' \
-    -DgRPC_GFLAGS_PROVIDER:STRING='package' \
     -DgRPC_BENCHMARK_PROVIDER:STRING='package' \
+    -DgRPC_ABSL_PROVIDER:STRING='package' \
     -DgRPC_USE_PROTO_LITE:BOOL=OFF \
     -DgRPC_BUILD_GRPC_CPP_PLUGIN:BOOL=ON \
     -DgRPC_BUILD_GRPC_CSHARP_PLUGIN:BOOL=ON \
@@ -641,11 +664,6 @@ sed -r -i \
     -DgRPC_BUILD_GRPC_RUBY_PLUGIN:BOOL=ON \
     -GNinja
 %cmake_build
-%else
-%set_build_flags
-# Default targets are: static shared plugins
-%make_build shared plugins
-%endif
 
 # ~~~~ Python ~~~~
 
@@ -660,7 +678,15 @@ PYTHONPATH="${PYTHONPATH}:${PYROOT}%{python3_sitearch}"
 export PYTHONPATH
 
 # ~~ grpcio ~~
-%set_grpc_python_environment
+# Note that we had to patch in the GRPC_PYTHON_BUILD_SYSTEM_ABSL option.
+export GRPC_PYTHON_BUILD_WITH_CYTHON='True'
+export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL='True'
+export GRPC_PYTHON_BUILD_SYSTEM_ZLIB='True'
+export GRPC_PYTHON_BUILD_SYSTEM_CARES='True'
+export GRPC_PYTHON_BUILD_SYSTEM_RE2='True'
+export GRPC_PYTHON_BUILD_SYSTEM_ABSL='True'
+export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY='True'
+export GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD='True'
 # We must set GRPC_PYTHON_CFLAGS to avoid unwanted defaults. We take the
 # upstream flags except that we remove -std=c99, which is inapplicable to the
 # C++ parts of the extension.
@@ -727,19 +753,27 @@ rm -vrf doc/build/.buildinfo doc/build/.doctrees
 
 %install
 # ~~~~ C (core) and C++ (cpp) ~~~~
-%if %{with cmake}
 %cmake_install
+
+%if %{with core_tests}
 # For some reason, grpc_cli is not installed. Do it manually.
 install -t '%{buildroot}%{_bindir}' -p -D '%{_vpath_builddir}/%{name}_cli'
 # grpc_cli build does not respect CMAKE_INSTALL_RPATH
 # https://github.com/grpc/grpc/issues/25176
 chrpath --delete '%{buildroot}%{_bindir}/%{name}_cli'
-%else
-export STRIP=/bin/true
-make install prefix='%{buildroot}%{_prefix}'
-make install-grpc-cli prefix='%{buildroot}%{_prefix}'
-chrpath --delete '%{buildroot}%{_bindir}/%{name}_cli'
+
+# This library is also required for grpc_cli; it is built as part of the test
+# code.
+install -t '%{buildroot}%{_libdir}' -p \
+    %{_vpath_builddir}/lib%{name}++_test_config.so.*
+chrpath --delete '%{buildroot}%{_libdir}/'lib%{name}++_test_config.so.*
+
+install -d '%{buildroot}/%{_mandir}/man1'
+install -t '%{buildroot}/%{_mandir}/man1' -p -m 0644 \
+    %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} \
+    %{SOURCE106} %{SOURCE107} %{SOURCE108}
 %endif
+
 # Remove any static libraries that may have been installed against our wishes
 find %{buildroot} -type f -name '*.a' -print -delete
 # Fix wrong permissions on installed headers
@@ -808,230 +842,418 @@ cp -rp doc/build '%{buildroot}%{_pkgdocdir}/python/html'
 %check
 export FEDORA_NO_NETWORK_TESTS=1
 
-%if %{with core_tests} && %{with cmake}
+%if %{with core_tests}
+PORT_SERVER_PORT="$(awk '
+  /_PORT_SERVER_PORT[[:blank:]]*=[[:blank:]]*[[:digit:]]+$/ { print $NF }
+' tools/run_tests/python_utils/start_port_server.py)"
+
 # Note that no tests are actually found by ctest:
 %ctest
 
-# Exclude tests that are known to hang. Assistance welcome in figuring out what
-# is wrong with these, especially if the hangs persist in the latest upstream
-# version. Note, however, that we are running the tests very differently from
-# upstream, which uses scripts in tools/run_tests/ that rebuild the entire
-# source and use Docker, so it is likely to be difficult to get help from
-# upstream for any failures here. Note that some of these tests would never
-# work in an environment without Internet access.
+# Exclude tests that are known to hang or otherwise fail. Assistance welcome in
+# figuring out what is wrong with these.  Note, however, that we are running
+# the tests very differently from upstream, which uses scripts in
+# tools/run_tests/ that rebuild the entire source and use Docker, so it is
+# likely to be difficult to get help from upstream for any failures here. Note
+# that some of these tests would never work in an environment without Internet
+# access.
 (
   cat <<'EOF'
-address_sorting
-alarm
-algorithm
+# Requires (or may require) network:
+resolve_address_using_ares_resolver
+resolve_address_using_ares_resolver_posix
+resolve_address_using_native_resolver
+resolve_address_using_native_resolver_posix
+ssl_transport_security
+
+# Seems to require privilege:
+flaky_network
+
+# Bad assumption about which directory the tests are running in:
+#
+# E0413 22:43:56.610039235   19861 subprocess_posix.cc:61]
+#   execv 'x86_64-redhat-linux-gnu/../../test/core/http/python_wrapper.sh'
+#   failed: No such file or directory
+# E0413 22:44:02.613251909   19856 httpscli_test.cc:55]
+#   assertion failed: response->status == 200
+httpcli
+httpscli
+
+# Error shutting down fd, then falsely claims the port server is not running.
+#
+# [ RUN      ] ServerBuilderTest.CreateServerOnePort
+# E0413 22:52:26.853421021   28920 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# E0413 22:52:30.082373319   28920 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# E0413 22:52:33.168560214   28923 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# E0413 22:52:36.905371168   28920 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# E0413 22:52:40.455413890   28923 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# E0413 22:52:44.012408974   28922 ev_epollex_linux.cc:516]
+#   Error shutting down fd 7. errno: 9
+# gRPC tests require a helper port server to allocate ports used
+# during the test.
+#
+# This server is not currently running.
+#
+# To start it, run tools/run_tests/start_port_server.py
+admin_services_end2end
 alts_concurrent_connectivity
-backoff
-badreq_bad_client
-bad_server_response
-bad_ssl_cert
-bad_streaming_id_bad_client
-bdp_estimator
-bin_decoder
-bin_encoder
-buffer_list
-byte_stream
-cancel_ares_query
-channel_create
-channel_trace
+async_end2end
 channelz_service
-channelz
-chttp2_hpack_encoder
-chttp2_settings_timeout
-chttp2_varint
 cli_call
 client_callback_end2end
 client_channel_stress
-client_crash
 client_interceptors_end2end
 client_lb_end2end
-close_fd
-combiner
-compression
-concurrent_connectivity
-connection_prefix_bad_client
-connection_refused
-context_list
-cxx_byte_buffer
-cxx_slice
+context_allocator_end2end
 delegating_channel
-dns_resolver_connectivity
-dns_resolver_cooldown_using_ares_resolver
-dns_resolver_cooldown_using_native_resolver
-dns_resolver
-dualstack_socket
-duplicate_header_bad_client
 end2end
-endpoint_pair
-error
-ev_epollex_linux
-exception
-fake_resolver
-fake_transport_security
-fd_conservation_posix
-fd_posix
 filter_end2end
-fling_stream
-fling
 generic_end2end
-goaway_server
-grpc_b64
-grpc_byte_buffer_reader
-grpc_channel_args
-grpc_channel_stack_builder
-grpc_channel_stack
-grpc_completion_queue
-grpc_completion_queue_threading
-grpc_control_plane_credentials
-grpc_credentials
-grpc_ipv6_loopback_available
-grpc_json_token
-grpc_jwt_verifier
-grpclb_api
-grpclb_end2end
-grpc_security_connector
-grpc_spiffe_security_connector
-grpc_ssl_credentials
 grpc_tool
-h2_census_nosec
-h2_census
-h2_compress_nosec
-h2_compress
-h2_fakesec
-h2_fd_nosec
-h2_fd
-h2_full_nosec
-h2_full+pipe_nosec
-h2_full+pipe
-h2_full
-h2_full+trace_nosec
-h2_full+trace
-h2_full+workarounds_nosec
-h2_full+workarounds
-h2_http_proxy_nosec
-h2_http_proxy
-h2_local_ipv4
-h2_local_ipv6
-h2_local_uds
-h2_oauth2
-h2_proxy_nosec
-h2_proxy
-h2_sockpair_1byte_nosec
-h2_sockpair_1byte
-h2_sockpair_nosec
-h2_sockpair
-h2_sockpair+trace_nosec
-h2_sockpair+trace
-h2_spiffe
-h2_ssl_cert
-h2_ssl_proxy
-h2_ssl_session_reuse
-h2_ssl
-h2_uds_nosec
-h2_uds
-headers_bad_client
-head_of_line_blocking_bad_client
+grpclb_end2end
 health_service_end2end
-hpack_parser
-hpack_table
-httpcli_format_request
-httpcli
-http_parser
-httpscli
 hybrid_end2end
-initial_settings_frame_bad_client
-init
-inproc_callback
-inproc
-interop
-invalid_call_argument
-lame_client
-large_metadata_bad_client
-load_file
-logical_thread
-message_allocator_end2end
-message_compress
-minimal_stack_is_minimal
 mock
-mpmcqueue
-multiple_server_queues
 nonblocking
-no_server
-num_external_connectivity_watchers
-out_of_bounds_bad_client
-parse_address
-parse_address_with_named_scope_id
-percent_encoding
-port_sharing_end2end
 proto_server_reflection
 raw_end2end
-resolver_component
-resource_quota
-secure_channel_create
-secure_endpoint
-sequential_connectivity
-server_builder_plugin
 server_builder
-server_chttp2
-server_crash
-server_early_return
-server_interceptors_end2end
-server_registered_method_bad_client
-server_request_call
-server
+server_builder_plugin
 service_config_end2end
-service_config
 shutdown
-simple_request_bad_client
-slice_buffer
-slice
-sockaddr_resolver
-ssl_transport_security
-stats
-status_conversion
-stream_compression
 streaming_throughput
-stream_owned_slice
-tcp_client_posix
-tcp_posix
-tcp_server_posix
-thread_manager
-threadpool
 thread_stress
-time_change
-timer
-transport_connectivity_state
-transport_metadata
-udp_server
-unknown_frame_bad_client
-uri_parser
-window_overflow_bad_client
-writes_per_rpc
-xds_bootstrap
 xds_end2end
-EOF
-) | sed -r 's|^(.*)$|%{_vpath_builddir}/\1_test|' | xargs chmod a-x
 
-find %{_vpath_builddir} -type f -perm /0111 -name '*_test' |
+# Unexplained:
+#
+# [ RUN      ] EvaluateArgsMetadataTest.HandlesNullMetadata
+# *** SIGSEGV received at time=1618368497 ***
+# PC: @     0x7fc56bfc1d3a  (unknown)  __strlen_sse2
+#     @ ... and at least 1 more frames
+evaluate_args
+# Unexplained:
+#
+# [ RUN      ] ExamineStackTest.AbseilStackProvider
+# ../test/core/gprpp/examine_stack_test.cc:75: Failure
+# Value of: stack_trace->find("GetCurrentStackTrace") != std::string::npos
+#   Actual: false
+# Expected: true
+examine_stack
+# Unexplained:
+#
+# [ RUN      ] StackTracerTest.Basic
+# ../test/core/util/stack_tracer_test.cc:35: Failure
+# Value of: absl::StrContains(stack_trace, "Basic")
+#   Actual: false
+# Expected: true
+# [  FAILED  ] StackTracerTest.Basic (3 ms)
+stack_tracer
+# Unexplained:
+#
+# E0413 22:47:06.188890509   22233 oauth2_credentials.cc:157]
+#   Call to http server ended with error 401
+#   [{"access_token":"ya29.AHES6ZRN3-HlhAPya30GnW_bHSb_", "expires_in":3599,
+#   "token_type":"Bearer"}].
+# *** SIGSEGV received at time=1618368426 ***
+test_core_security_credentials
+
+%ifarch s390x
+# Unexplained:
+#
+# [ RUN      ] AddressSortingTest.TestSorterKnowsIpv6LoopbackIsAvailable
+# ../test/cpp/naming/address_sorting_test.cc:807: Failure
+# Expected equality of these values:
+#   source_addr_output->sin6_family
+#     Which is: 0
+#   10
+# ../test/cpp/naming/address_sorting_test.cc:817: Failure
+# Expected equality of these values:
+#   source_addr_str
+#     Which is: "::"
+#   "::1"
+# [  FAILED  ] AddressSortingTest.TestSorterKnowsIpv6LoopbackIsAvailable (0 ms)
+address_sorting
+
+# Unexplained:
+#
+# Status is not ok: Setting authenticated associated data failed
+# E0422 21:34:46.864696339 3920578 aes_gcm_test.cc:77]         assertion
+#   failed: status == GRPC_STATUS_OK
+# *** SIGABRT received at time=1619127286 ***
+# PC: @      0x3ff83748e0c  (unknown)  raise
+#     @      0x3ff836014c4  (unknown)  (unknown)
+#     @      0x3ff8360168a  (unknown)  (unknown)
+#     @      0x3ff84264b78  (unknown)  (unknown)
+#     @      0x3ff83748e0c  (unknown)  raise
+#     @      0x3ff8372bae8  (unknown)  abort
+#     @      0x2aa3ed83a38  (unknown)  gsec_assert_ok()
+#     @      0x2aa3ed83b70  (unknown)  gsec_test_random_encrypt_decrypt()
+#     @      0x2aa3ed8155e  (unknown)  main
+#     @      0x3ff8372bdf4  (unknown)  __libc_start_main
+#     @      0x2aa3ed82724  (unknown)  (unknown)
+alts_crypt
+
+# Unexplained:
+#
+# (aborted without output)
+alts_crypter
+
+# Unexplained:
+#
+# (aborted without output)
+alts_frame_protector
+
+# Unexplained:
+#
+# E0502 15:06:40.951214061 1640707
+# alts_grpc_integrity_only_record_protocol.cc:109] Failed to protect, Setting
+#   authenticated associated data failed
+# E0502 15:06:40.951411109 1640707 alts_grpc_record_protocol_test.cc:282]
+#   assertion failed: status == TSI_OK
+# *** SIGABRT received at time=1619968000 ***
+# PC: @      0x3ff939c8e0c  (unknown)  raise
+#     @      0x3ff938814c4  (unknown)  (unknown)
+#     @      0x3ff9388168a  (unknown)  (unknown)
+#     @      0x3ff944e4b78  (unknown)  (unknown)
+#     @      0x3ff939c8e0c  (unknown)  raise
+#     @      0x3ff939abae8  (unknown)  abort
+#     @      0x2aa11482c9e  (unknown)  random_seal_unseal()
+#     @      0x2aa11483558  (unknown)  alts_grpc_record_protocol_tests()
+#     @      0x2aa11481b08  (unknown)  main
+#     @      0x3ff939abdf4  (unknown)  __libc_start_main
+#     @      0x2aa11481bc4  (unknown)  (unknown)
+alts_grpc_record_protocol
+
+# Unexplained:
+#
+# E0505 21:08:10.125639702 2153925 alts_handshaker_client.cc:863]
+#   client or client->vtable has not been initialized properly
+# E0505 21:08:10.125794714 2153925 alts_handshaker_client.cc:579]
+#   Invalid arguments to handshaker_client_start_server()
+# E0505 21:08:10.125877215 2153925 alts_handshaker_client.cc:874]
+#   client or client->vtable has not been initialized properly
+# E0505 21:08:10.125948887 2153925 alts_handshaker_client.cc:615]
+#   Invalid arguments to handshaker_client_next()
+# E0505 21:08:10.126015062 2153925 alts_handshaker_client.cc:885]
+#   client or client->vtable has not been initialized properly
+# E0505 21:08:10.126146291 2153925 alts_handshaker_client_test.cc:177]
+#   assertion failed:
+#   grpc_gcp_StartClientHandshakeReq_handshake_security_protocol( client_start)
+#   == grpc_gcp_ALTS
+# *** SIGABRT received at time=1620248890 ***
+# PC: @      0x3ff98ac8e0c  (unknown)  raise
+#     @      0x3ff989814c4  (unknown)  (unknown)
+#     @      0x3ff9898168a  (unknown)  (unknown)
+#     @      0x3ff99664b78  (unknown)  (unknown)
+#     @      0x3ff98ac8e0c  (unknown)  raise
+#     @      0x3ff98aabae8  (unknown)  abort
+#     @      0x2aa3760375e  (unknown)  check_client_start_success()
+#     @      0x3ff99419a72  (unknown)  continue_make_grpc_call()
+#     @      0x3ff9941ac58  (unknown)  handshaker_client_start_client()
+#     @      0x2aa37603c66  (unknown)  schedule_request_success_test()
+#     @      0x2aa3760281e  (unknown)  main
+#     @      0x3ff98aabdf4  (unknown)  __libc_start_main
+#     @      0x2aa376028b4  (unknown)  (unknown)
+alts_handshaker_client
+
+# Unexplained:
+#
+# (aborted without output)
+alts_iovec_record_protocol
+
+# Unexplained:
+#
+# [ RUN      ] AltsUtilTest.AuthContextWithGoodAltsContextWithoutRpcVersions
+# ../test/cpp/common/alts_util_test.cc:122: Failure
+# Expected equality of these values:
+#   expected_sl
+#     Which is: 1
+#   alts_context->security_level()
+#     Which is: 0
+# [  FAILED  ] AltsUtilTest.AuthContextWithGoodAltsContextWithoutRpcVersions (0 ms)
+# [ RUN      ] AltsUtilTest.AuthContextWithGoodAltsContext
+# [       OK ] AltsUtilTest.AuthContextWithGoodAltsContext (0 ms)
+# [ RUN      ] AltsUtilTest.AltsClientAuthzCheck
+# [       OK ] AltsUtilTest.AltsClientAuthzCheck (0 ms)
+# [----------] 7 tests from AltsUtilTest (0 ms total)
+# [----------] Global test environment tear-down
+# [==========] 7 tests from 1 test suite ran. (0 ms total)
+# [  PASSED  ] 6 tests.
+# [  FAILED  ] 1 test, listed below:
+# [  FAILED  ] AltsUtilTest.AuthContextWithGoodAltsContextWithoutRpcVersions
+#  1 FAILED TEST
+# E0506 13:27:12.407095885 2895549 alts_util.cc:37]
+#     auth_context is nullptr.
+# E0506 13:27:12.407174329 2895549 alts_util.cc:43]
+#     contains zero or more than one ALTS context.
+# E0506 13:27:12.407191312 2895549 alts_util.cc:43]
+#     contains zero or more than one ALTS context.
+# E0506 13:27:12.407210713 2895549 alts_util.cc:50]
+#     fails to parse ALTS context.
+# E0506 13:27:12.407261763 2895549 alts_util.cc:43]
+#     contains zero or more than one ALTS context.
+alts_util
+
+# Unexplained:
+#
+# E0506 14:42:08.079363072 2916785
+#     alts_grpc_integrity_only_record_protocol.cc:109] Failed to protect,
+#     Setting authenticated associated data failed
+# E0506 14:42:08.079807806 2916785 alts_zero_copy_grpc_protector_test.cc:183]
+#     assertion failed: tsi_zero_copy_grpc_protector_protect( sender,
+#     &var->original_sb, &var->protected_sb) == TSI_OK
+# *** SIGABRT received at time=1620312128 ***
+# PC: @      0x3ffae548e0c  (unknown)  raise
+#     @      0x3ffae4014c4  (unknown)  (unknown)
+#     @      0x3ffae40168a  (unknown)  (unknown)
+#     @      0x3ffaf064b78  (unknown)  (unknown)
+#     @      0x3ffae548e0c  (unknown)  raise
+#     @      0x3ffae52bae8  (unknown)  abort
+#     @      0x2aa11202728  (unknown)  seal_unseal_small_buffer()
+#     @      0x2aa112028d8  (unknown)
+#         alts_zero_copy_protector_seal_unseal_small_buffer_tests()
+#     @      0x2aa112019d6  (unknown)  main
+#     @      0x3ffae52bdf4  (unknown)  __libc_start_main
+#     @      0x2aa11201a84  (unknown)  (unknown)
+alts_zero_copy_grpc_protector
+
+# Unexplained:
+#
+# E0506 16:24:35.085362185 2328244 cq_verifier.cc:228]
+#     no event received, but expected:tag(257) GRPC_OP_COMPLETE success=1
+#     ../test/core/end2end/goaway_server_test.cc:264
+# tag(769) GRPC_OP_COMPLETE success=1
+#     ../test/core/end2end/goaway_server_test.cc:265
+# *** SIGABRT received at time=1620318275 ***
+# PC: @      0x3ffa05c8e0c  (unknown)  raise
+#     @      0x3ffa04814c4  (unknown)  (unknown)
+#     @      0x3ffa048168a  (unknown)  (unknown)
+#     @      0x3ffa11e4b78  (unknown)  (unknown)
+#     @      0x3ffa05c8e0c  (unknown)  raise
+#     @      0x3ffa05abae8  (unknown)  abort
+#     @      0x2aa1e984e96  (unknown)  cq_verify()
+#     @      0x2aa1e9833ce  (unknown)  main
+#     @      0x3ffa05abdf4  (unknown)  __libc_start_main
+#     @      0x2aa1e983ac4  (unknown)  (unknown)
+goaway_server
+
+# Unexplained:
+#
+# *** SIGABRT received at time=1620336694 ***
+# PC: @      0x3ffa3348e0c  (unknown)  raise
+#     @      0x3ffa32014c4  (unknown)  (unknown)
+#     @      0x3ffa320168a  (unknown)  (unknown)
+#     @      0x3ffa39e4b78  (unknown)  (unknown)
+#     @      0x3ffa3348e0c  (unknown)  raise
+#     @      0x3ffa332bae8  (unknown)  abort
+#     @      0x2aa27600c8e  (unknown)  verification_test()
+#     @      0x2aa27600a24  (unknown)  main
+#     @      0x3ffa332bdf4  (unknown)  __libc_start_main
+#     @      0x2aa27600aa4  (unknown)  (unknown)
+murmur_hash
+
+# Unexplained:
+#
+# E0416 16:03:14.051081049   67245 tcp_posix_test.cc:387]
+#     assertion failed: error == GRPC_ERROR_NONE
+# *** SIGABRT received at time=1618588994 ***
+# PC: @       0x4001f5be0c  (unknown)  raise
+#     @       0x40020bf4c4  (unknown)  (unknown)
+#     @       0x40020bf68a  (unknown)  (unknown)
+#     @       0x4002624df0  (unknown)  (unknown)
+#     @       0x4001f5be0c  (unknown)  raise
+#     @       0x4001f3eae8  (unknown)  abort
+#     @       0x4000003f60  (unknown)  timestamps_verifier()
+#     @       0x4001ac36d8  (unknown)  grpc_core::TracedBuffer::Shutdown()
+#     @       0x4001ae53ea  (unknown)  tcp_shutdown_buffer_list()
+#     @       0x4001ae774a  (unknown)  tcp_flush()
+#     @       0x4001ae99f2  (unknown)  tcp_write()
+#     @       0x4000005806  (unknown)  write_test()
+#     @       0x400000622e  (unknown)  run_tests()
+#     @       0x40000028c8  (unknown)  main
+#     @       0x4001f3edf4  (unknown)  __libc_start_main
+#     @       0x40000029f4  (unknown)  (unknown)
+tcp_posix
+%endif
+
+%ifarch %{ix86}
+# Unexplained:
+#
+# [ RUN      ] ChannelTracerTest.TestMultipleEviction
+# ../test/core/channel/channel_trace_test.cc:65: Failure
+# Expected equality of these values:
+#   array.array_value().size()
+#     Which is: 3
+#   expected
+#     Which is: 4
+# [  FAILED  ] ChannelTracerTest.TestMultipleEviction (2 ms)
+channel_trace
+%endif
+
+%ifarch %{ix86} %{arm32}
+# Unexplained:
+#
+# [ RUN      ] CertificateProviderStoreTest.Multithreaded
+# terminate called without an active exception
+# *** SIGABRT received at time=1619103150 ***
+# PC: @ 0xf7fa3559  (unknown)  __kernel_vsyscall
+#     @ ... and at least 1 more frames
+certificate_provider_store
+
+# Unexplained:
+#
+# [ RUN      ] GrpcTlsCertificateDistributorTest.SetKeyMaterialsInCallback
+# terminate called without an active exception
+# *** SIGABRT received at time=1619125567 ***
+# PC: @ 0xb682c114  (unknown)  raise
+#     @ 0xb67e817c  (unknown)  (unknown)
+#     @ 0xb682d6b0  (unknown)  (unknown)
+#     @ 0xb682c114  (unknown)  raise
+grpc_tls_certificate_distributor
+
+# Unexplained:
+#
+# [ RUN      ] GetCpuStatsTest.BusyNoLargerThanTotal
+# ../test/cpp/server/load_reporter/get_cpu_stats_test.cc:39: Failure
+# Expected: (busy) <= (total), actual: 9025859384538762329 vs
+#     3751280126112716351
+# [  FAILED  ] GetCpuStatsTest.BusyNoLargerThanTotal (0 ms)
+lb_get_cpu_stats
+%endif
+
+EOF
+) |
+  grep -E -v '^(#|$)' |
+  sed -r 's|^(.*)$|%{_vpath_builddir}/\1_test|' |
+  xargs -r chmod -v a-x
+
+find %{_vpath_builddir} -type f -perm /0111 -name '*_test' | sort |
   while read -r testexe
   do
     echo "==== $(date -u --iso-8601=ns): $(basename "${testexe}") ===="
+    %{__python3} tools/run_tests/start_port_server.py
     # We have tried to skip all tests that hang, but since this is a common
     # problem, we use timeout so that a test that does hang breaks the build in
     # a reasonable amount of time.
     timeout -k 11m -v 10m "${testexe}"
   done
+
+# Stop the port server
+curl "http://localhost:${PORT_SERVER_PORT}/quitquitquit" || :
 %endif
 
 pushd src/python/grpcio_tests
 for suite in \
     test_lite \
     %{?with_python_aio_tests:test_aio} \
-    %{?with_python_gevent_tests:test_gevent}
+    %{?with_python_gevent_tests:test_gevent} \
+    test_py3_only
 do
   # See the implementation of the %%pytest macro, upon which our environment
   # setup is based:
@@ -1063,7 +1285,6 @@ fi
 %{_libdir}/libaddress_sorting.so.%{c_so_version}*
 %{_libdir}/libgpr.so.%{c_so_version}*
 %{_libdir}/lib%{name}.so.%{c_so_version}*
-%{_libdir}/lib%{name}_cronet.so.%{c_so_version}*
 %{_libdir}/lib%{name}_unsecure.so.%{c_so_version}*
 %{_libdir}/libupb.so.%{c_so_version}*
 
@@ -1081,18 +1302,28 @@ fi
 
 %files cpp
 %{_libdir}/lib%{name}++.so.%{cpp_so_version}*
+%{_libdir}/lib%{name}++_alts.so.%{cpp_so_version}*
 %{_libdir}/lib%{name}++_error_details.so.%{cpp_so_version}*
 %{_libdir}/lib%{name}++_reflection.so.%{cpp_so_version}*
 %{_libdir}/lib%{name}++_unsecure.so.%{cpp_so_version}*
+%{_libdir}/lib%{name}_plugin_support.so.%{cpp_so_version}*
 
 %{_libdir}/lib%{name}pp_channelz.so.%{cpp_so_version}*
 
 
+%if %{with core_tests}
 %files cli
 %{_bindir}/%{name}_cli
+%{_libdir}/lib%{name}++_test_config.so.%{cpp_so_version}*
+%{_mandir}/man1/%{name}_cli.1*
+%{_mandir}/man1/%{name}_cli-*.1*
+%endif
 
 
 %files plugins
+# These are for program use and do not offer a CLI for the end user, so they
+# should really be in %%{_libexecdir}; however, too many downstream users
+# expect them in $PATH to change this for the time being.
 %{_bindir}/%{name}_*_plugin
 
 
@@ -1100,18 +1331,20 @@ fi
 %{_libdir}/libaddress_sorting.so
 %{_libdir}/libgpr.so
 %{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}_cronet.so
 %{_libdir}/lib%{name}_unsecure.so
 %{_libdir}/libupb.so
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/gpr.pc
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}_unsecure.pc
+%{_libdir}/cmake/%{name}
 
 %{_libdir}/lib%{name}++.so
+%{_libdir}/lib%{name}++_alts.so
 %{_libdir}/lib%{name}++_error_details.so
 %{_libdir}/lib%{name}++_reflection.so
 %{_libdir}/lib%{name}++_unsecure.so
+%{_libdir}/lib%{name}_plugin_support.so
 %{_includedir}/%{name}++
 %{_libdir}/pkgconfig/%{name}++.pc
 %{_libdir}/pkgconfig/%{name}++_unsecure.pc
@@ -1157,6 +1390,20 @@ fi
 
 
 %changelog
+* Tue May 11 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.37.1-1
+- General:
+  * New version 1.37.1
+  * Drop patches that were upstreamed since the last packaged release, were
+    backported from upstream in the first place, or have otherwise been
+    obsoleted by upstream changes.
+  * Rebase/update remaining patches as needed
+  * Drop Fedora 32 compatibility
+  * Add man pages for grpc_cli
+- C (core) and C++ (cpp):
+  * Switch to CMake build system
+  * Build with C++17 for compatibility with the abseil-cpp package in Fedora
+  * Add various Requires to -devel subpackage
+
 * Tue Apr 06 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.26.0-15
 - General:
   * Do not use %%exclude for unpackaged files (RPM 4.17 compatibility)
diff --git a/grpc_cli-call.1 b/grpc_cli-call.1
new file mode 100644
index 0000000..bc2490a
--- /dev/null
+++ b/grpc_cli-call.1
@@ -0,0 +1,104 @@
+.TH GRPC_CLI\-CALL "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ call
+\(en call method
+.SH SYNOPSIS
+.B grpc_cli call
+.I address
+.RI [ service [\fB. method ]] 
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I address
+.IB host : port
+.TP
+.I service
+Exported service name
+.TP
+.I method
+Method name
+.TP
+.I request
+Text protobuffer (overrides
+.BR \-\-infile )
+.TP
+.B \-\-protofiles
+Comma separated proto files used as a fallback when parsing request/response
+.TP
+.B \-\-proto_path
+The search paths of proto files
+.RB ( :
+separated), valid only when
+.B \-\-protofiles
+is given
+.TP
+.B \-\-noremotedb
+Don\(cqt attempt to use reflection service at all
+.TP
+.B \-\-metadata
+The metadata to be sent to the server
+.TP
+.B \-\-infile
+Input filename (defaults to
+.IR stdin )
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.TP
+.B \-\-binary_input
+Input in binary format
+.TP
+.B \-\-binary_output
+Output in binary format
+.TP
+.B \-\-json_input
+Input in json format
+.TP
+.B \-\-json_output
+Output in json format
+.TP
+.B \-\-timeout
+Specify timeout (in seconds), used to set the deadline for RPCs.
+The default value of
+.B \-1
+means no deadline has been set.
+.TP
+.B \-\-ssl_target
+Set server host for ssl validation
+.TP
+.B \-\-ssl_client_cert
+Client cert for ssl
+.TP
+.B \-\-ssl_client_key
+Client private key for ssl
+.TP
+.B \-\-local_connect_type
+Set to
+.B local_tcp
+or
+.B uds
+.TP
+.B \-\-channel_creds_type
+Set to
+.BR insecure ,
+.BR ssl ,
+.BR gdc ,
+.BR alts ,
+or
+.B local
+.TP
+.B \-\-call_creds
+Set to
+.BR none ,
+or
+.BI access_token= token
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-help.1 b/grpc_cli-help.1
new file mode 100644
index 0000000..f3074a1
--- /dev/null
+++ b/grpc_cli-help.1
@@ -0,0 +1,16 @@
+.TH GRPC_CLI\-HELP "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ help
+\(en print help
+.SH SYNOPSIS
+.B grpc_cli help
+.I subcommand
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1)
diff --git a/grpc_cli-ls.1 b/grpc_cli-ls.1
new file mode 100644
index 0000000..4a3460e
--- /dev/null
+++ b/grpc_cli-ls.1
@@ -0,0 +1,65 @@
+.TH GRPC_CLI\-LS "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ ls
+\(en list services
+.SH SYNOPSIS
+.B grpc_cli ls
+.I address
+.RI [ service [\fB/ method ]] 
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I address
+.IB host : port
+.TP
+.I service
+Exported service name
+.TP
+.I method
+Method name
+.TP
+.B \-\-l
+Use a long listing format
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.TP
+.B \-\-ssl_target
+Set server host for ssl validation
+.TP
+.B \-\-ssl_client_cert
+Client cert for ssl
+.TP
+.B \-\-ssl_client_key
+Client private key for ssl
+.TP
+.B \-\-local_connect_type
+Set to
+.B local_tcp
+or
+.B uds
+.TP
+.B \-\-channel_creds_type
+Set to
+.BR insecure ,
+.BR ssl ,
+.BR gdc ,
+.BR alts ,
+or
+.B local
+.TP
+.B \-\-call_creds
+Set to
+.BR none ,
+or
+.BI access_token= token
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-parse.1 b/grpc_cli-parse.1
new file mode 100644
index 0000000..2e32c0e
--- /dev/null
+++ b/grpc_cli-parse.1
@@ -0,0 +1,93 @@
+.TH GRPC_CLI\-PARSE "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ parse
+\(en parse message
+.SH SYNOPSIS
+.B grpc_cli parse
+.I address
+.I type
+.RI [ message ]
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I address
+.IB host : port
+.TP
+.I type
+Protocol buffer type name
+.TP
+.I message
+Text protobuffer (overrides
+.BR \-\-infile )
+.TP
+.B \-\-protofiles
+Comma separated proto files used as a fallback when parsing request/response
+.TP
+.B \-\-proto_path
+The search paths of proto files
+.RB ( :
+separated), valid only when
+.B \-\-protofiles
+is given
+.TP
+.B \-\-noremotedb
+Don\(cqt attempt to use reflection service at all
+.TP
+.B \-\-infile
+Input filename (defaults to
+.IR stdin )
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.TP
+.B \-\-binary_input
+Input in binary format
+.TP
+.B \-\-binary_output
+Output in binary format
+.TP
+.B \-\-json_input
+Input in json format
+.TP
+.B \-\-json_output
+Output in json format
+.TP
+.B \-\-ssl_target
+Set server host for ssl validation
+.TP
+.B \-\-ssl_client_cert
+Client cert for ssl
+.TP
+.B \-\-ssl_client_key
+Client private key for ssl
+.TP
+.B \-\-local_connect_type
+Set to
+.B local_tcp
+or
+.B uds
+.TP
+.B \-\-channel_creds_type
+Set to
+.BR insecure ,
+.BR ssl ,
+.BR gdc ,
+.BR alts ,
+or
+.B local
+.TP
+.B \-\-call_creds
+Set to
+.BR none ,
+or
+.BI access_token= token
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-tobinary.1 b/grpc_cli-tobinary.1
new file mode 100644
index 0000000..e58b7e9
--- /dev/null
+++ b/grpc_cli-tobinary.1
@@ -0,0 +1,39 @@
+.TH GRPC_CLI\-TOBINARY "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ tobinary
+\(en convert text message to binary
+.SH SYNOPSIS
+.B grpc_cli tobinary
+.I protofiles
+.I type
+.RI [ message ]
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I protofiles
+Comma separated list of proto files
+.TP
+.I type
+Protocol buffer type name
+.TP
+.B \-\-proto_path
+The search paths of proto files
+.RB ( :
+separated)
+.TP
+.B \-\-infile
+Input filename (defaults to
+.IR stdin )
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-tojson.1 b/grpc_cli-tojson.1
new file mode 100644
index 0000000..59d407d
--- /dev/null
+++ b/grpc_cli-tojson.1
@@ -0,0 +1,38 @@
+.TH GRPC_CLI\-TOJSON "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ tojson
+\(en convert binary message to json
+.SH SYNOPSIS
+.B grpc_cli tojson
+.I protofiles
+.I type
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I protofiles
+Comma separated list of proto files
+.TP
+.I type
+Protocol buffer type name
+.TP
+.B \-\-proto_path
+The search paths of proto files
+.RB ( :
+separated)
+.TP
+.B \-\-infile
+Input filename (defaults to
+.IR stdin )
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-totext.1 b/grpc_cli-totext.1
new file mode 100644
index 0000000..9b297f0
--- /dev/null
+++ b/grpc_cli-totext.1
@@ -0,0 +1,38 @@
+.TH GRPC_CLI\-TOTEXT "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ totext
+\(en convert binary message to text
+.SH SYNOPSIS
+.B grpc_cli totext
+.I protofiles
+.I type
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I protofiles
+Comma separated list of proto files
+.TP
+.I type
+Protocol buffer type name
+.TP
+.B \-\-proto_path
+The search paths of proto files
+.RB ( :
+separated)
+.TP
+.B \-\-infile
+Input filename (defaults to
+.IR stdin )
+.TP
+.B \-\-outfile
+Output filename (defaults to
+.IR stdout )
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli-type.1 b/grpc_cli-type.1
new file mode 100644
index 0000000..99e2caf
--- /dev/null
+++ b/grpc_cli-type.1
@@ -0,0 +1,55 @@
+.TH GRPC_CLI\-TYPE "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli\ type
+\(en print type
+.SH SYNOPSIS
+.B grpc_cli type
+.I address
+.I type
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.TP
+.I address
+.IB host : port
+.TP
+.I type
+Protocol buffer type name
+.TP
+.B \-\-ssl_target
+Set server host for ssl validation
+.TP
+.B \-\-ssl_client_cert
+Client cert for ssl
+.TP
+.B \-\-ssl_client_key
+Client private key for ssl
+.TP
+.B \-\-local_connect_type
+Set to
+.B local_tcp
+or
+.B uds
+.TP
+.B \-\-channel_creds_type
+Set to
+.BR insecure ,
+.BR ssl ,
+.BR gdc ,
+.BR alts ,
+or
+.B local
+.TP
+.B \-\-call_creds
+Set to
+.BR none ,
+or
+.BI access_token= token
+.SH "SEE\ ALSO"
+.BR grpc_cli (1),
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/grpc_cli.1 b/grpc_cli.1
new file mode 100644
index 0000000..a03c566
--- /dev/null
+++ b/grpc_cli.1
@@ -0,0 +1,48 @@
+.TH GRPC_CLI "1" "May 2021" "" "User Commands"
+.SH NAME
+.B grpc_cli
+\(en a command-line tool to talk to a grpc server
+.SH SYNOPSIS
+.B grpc_cli
+.I COMMAND
+.RI [ OPTION ]...\:
+.SH OPTIONS
+.SS COMMANDS
+.P
+Each of the following has a corresponding man page: for example,
+.BR grpc_cli\-ls (1)
+for
+.RB \(lq grpc_cli\ ls \(rq.
+.TP
+.B grpc_cli\ ls
+List services
+.TP
+.B grpc_cli\ call
+Call method
+.TP
+.B grpc_cli\ type
+Print type
+.TP
+.B grpc_cli\ parse
+Parse message
+.TP
+.B grpc_cli\ totext
+Convert binary message to text
+.TP
+.B grpc_cli\ tojson
+Convert binary message to json
+.TP
+.B grpc_cli\ tobinary
+Convert text message to binary
+.TP
+.B grpc_cli\ help
+Print this message, or per-command usage
+.SH "SEE\ ALSO"
+.BR grpc_cli\-ls (1),
+.BR grpc_cli\-call (1),
+.BR grpc_cli\-type (1),
+.BR grpc_cli\-parse (1),
+.BR grpc_cli\-totext (1),
+.BR grpc_cli\-tojson (1),
+.BR grpc_cli\-tobinary (1),
+.BR grpc_cli\-help (1)
diff --git a/sources b/sources
index 818c148..ff62e5f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (grpc-1.26.0.tar.gz) = 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
+SHA512 (grpc-1.37.1.tar.gz) = fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 SHA512 (googletest-release-1.10.0.tar.gz) = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9