Merge github.com:grpc/grpc into fuzzy-bits

1 files changed, 77 insertions, 46 deletions

diff --git a/build.yaml b/build.yaml
index cc6047687d..43d3c680b8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -340,27 +340,6 @@ filegroups:
   - src/core/lib/surface/server.h
   - src/core/lib/surface/surface_trace.h
   - src/core/lib/transport/byte_stream.h
-  - src/core/lib/transport/chttp2/alpn.h
-  - src/core/lib/transport/chttp2/bin_encoder.h
-  - src/core/lib/transport/chttp2/frame.h
-  - src/core/lib/transport/chttp2/frame_data.h
-  - src/core/lib/transport/chttp2/frame_goaway.h
-  - src/core/lib/transport/chttp2/frame_ping.h
-  - src/core/lib/transport/chttp2/frame_rst_stream.h
-  - src/core/lib/transport/chttp2/frame_settings.h
-  - src/core/lib/transport/chttp2/frame_window_update.h
-  - src/core/lib/transport/chttp2/hpack_encoder.h
-  - src/core/lib/transport/chttp2/hpack_parser.h
-  - src/core/lib/transport/chttp2/hpack_table.h
-  - src/core/lib/transport/chttp2/http2_errors.h
-  - src/core/lib/transport/chttp2/huffsyms.h
-  - src/core/lib/transport/chttp2/incoming_metadata.h
-  - src/core/lib/transport/chttp2/internal.h
-  - src/core/lib/transport/chttp2/status_conversion.h
-  - src/core/lib/transport/chttp2/stream_map.h
-  - src/core/lib/transport/chttp2/timeout_encoding.h
-  - src/core/lib/transport/chttp2/varint.h
-  - src/core/lib/transport/chttp2_transport.h
   - src/core/lib/transport/connectivity_state.h
   - src/core/lib/transport/metadata.h
   - src/core/lib/transport/metadata_batch.h
@@ -461,7 +440,6 @@ filegroups:
   - src/core/lib/surface/call_log_batch.c
   - src/core/lib/surface/channel.c
   - src/core/lib/surface/channel_connectivity.c
-  - src/core/lib/surface/channel_create.c
   - src/core/lib/surface/channel_init.c
   - src/core/lib/surface/channel_ping.c
   - src/core/lib/surface/channel_stack_type.c
@@ -471,31 +449,9 @@ filegroups:
   - src/core/lib/surface/lame_client.c
   - src/core/lib/surface/metadata_array.c
   - src/core/lib/surface/server.c
-  - src/core/lib/surface/server_chttp2.c
   - src/core/lib/surface/validate_metadata.c
   - src/core/lib/surface/version.c
   - src/core/lib/transport/byte_stream.c
-  - src/core/lib/transport/chttp2/alpn.c
-  - src/core/lib/transport/chttp2/bin_encoder.c
-  - src/core/lib/transport/chttp2/frame_data.c
-  - src/core/lib/transport/chttp2/frame_goaway.c
-  - src/core/lib/transport/chttp2/frame_ping.c
-  - src/core/lib/transport/chttp2/frame_rst_stream.c
-  - src/core/lib/transport/chttp2/frame_settings.c
-  - src/core/lib/transport/chttp2/frame_window_update.c
-  - src/core/lib/transport/chttp2/hpack_encoder.c
-  - src/core/lib/transport/chttp2/hpack_parser.c
-  - src/core/lib/transport/chttp2/hpack_table.c
-  - src/core/lib/transport/chttp2/huffsyms.c
-  - src/core/lib/transport/chttp2/incoming_metadata.c
-  - src/core/lib/transport/chttp2/parsing.c
-  - src/core/lib/transport/chttp2/status_conversion.c
-  - src/core/lib/transport/chttp2/stream_lists.c
-  - src/core/lib/transport/chttp2/stream_map.c
-  - src/core/lib/transport/chttp2/timeout_encoding.c
-  - src/core/lib/transport/chttp2/varint.c
-  - src/core/lib/transport/chttp2/writing.c
-  - src/core/lib/transport/chttp2_transport.c
   - src/core/lib/transport/connectivity_state.c
   - src/core/lib/transport/metadata.c
   - src/core/lib/transport/metadata_batch.c
@@ -542,9 +498,7 @@ filegroups:
   - src/core/lib/security/security_connector.c
   - src/core/lib/security/security_context.c
   - src/core/lib/security/server_auth_filter.c
-  - src/core/lib/security/server_secure_chttp2.c
   - src/core/lib/surface/init_secure.c
-  - src/core/lib/surface/secure_channel_create.c
   - src/core/lib/tsi/fake_transport_security.c
   - src/core/lib/tsi/ssl_transport_security.c
   - src/core/lib/tsi/transport_security.c
@@ -568,6 +522,77 @@ filegroups:
   - test/core/util/port_server_client.c
   - test/core/util/port_windows.c
   - test/core/util/slice_splitter.c
+- name: grpc_transport_chttp2
+  headers:
+  - src/core/ext/transport/chttp2/transport/alpn.h
+  - src/core/ext/transport/chttp2/transport/bin_encoder.h
+  - src/core/ext/transport/chttp2/transport/chttp2_transport.h
+  - src/core/ext/transport/chttp2/transport/frame.h
+  - src/core/ext/transport/chttp2/transport/frame_data.h
+  - src/core/ext/transport/chttp2/transport/frame_goaway.h
+  - src/core/ext/transport/chttp2/transport/frame_ping.h
+  - src/core/ext/transport/chttp2/transport/frame_rst_stream.h
+  - src/core/ext/transport/chttp2/transport/frame_settings.h
+  - src/core/ext/transport/chttp2/transport/frame_window_update.h
+  - src/core/ext/transport/chttp2/transport/hpack_encoder.h
+  - src/core/ext/transport/chttp2/transport/hpack_parser.h
+  - src/core/ext/transport/chttp2/transport/hpack_table.h
+  - src/core/ext/transport/chttp2/transport/http2_errors.h
+  - src/core/ext/transport/chttp2/transport/huffsyms.h
+  - src/core/ext/transport/chttp2/transport/incoming_metadata.h
+  - src/core/ext/transport/chttp2/transport/internal.h
+  - src/core/ext/transport/chttp2/transport/status_conversion.h
+  - src/core/ext/transport/chttp2/transport/stream_map.h
+  - src/core/ext/transport/chttp2/transport/timeout_encoding.h
+  - src/core/ext/transport/chttp2/transport/varint.h
+  src:
+  - src/core/ext/transport/chttp2/transport/alpn.c
+  - src/core/ext/transport/chttp2/transport/bin_encoder.c
+  - src/core/ext/transport/chttp2/transport/chttp2_transport.c
+  - src/core/ext/transport/chttp2/transport/frame_data.c
+  - src/core/ext/transport/chttp2/transport/frame_goaway.c
+  - src/core/ext/transport/chttp2/transport/frame_ping.c
+  - src/core/ext/transport/chttp2/transport/frame_rst_stream.c
+  - src/core/ext/transport/chttp2/transport/frame_settings.c
+  - src/core/ext/transport/chttp2/transport/frame_window_update.c
+  - src/core/ext/transport/chttp2/transport/hpack_encoder.c
+  - src/core/ext/transport/chttp2/transport/hpack_parser.c
+  - src/core/ext/transport/chttp2/transport/hpack_table.c
+  - src/core/ext/transport/chttp2/transport/huffsyms.c
+  - src/core/ext/transport/chttp2/transport/incoming_metadata.c
+  - src/core/ext/transport/chttp2/transport/parsing.c
+  - src/core/ext/transport/chttp2/transport/status_conversion.c
+  - src/core/ext/transport/chttp2/transport/stream_lists.c
+  - src/core/ext/transport/chttp2/transport/stream_map.c
+  - src/core/ext/transport/chttp2/transport/timeout_encoding.c
+  - src/core/ext/transport/chttp2/transport/varint.c
+  - src/core/ext/transport/chttp2/transport/writing.c
+  uses:
+  - grpc_base
+- name: grpc_transport_chttp2_client_insecure
+  src:
+  - src/core/ext/transport/chttp2/client/insecure/channel_create.c
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+- name: grpc_transport_chttp2_client_secure
+  src:
+  - src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+- name: grpc_transport_chttp2_server_insecure
+  src:
+  - src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
+- name: grpc_transport_chttp2_server_secure
+  src:
+  - src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
+  uses:
+  - grpc_transport_chttp2
+  - grpc_base
 - name: nanopb
   headers:
   - third_party/nanopb/pb.h
@@ -610,6 +635,10 @@ libs:
   dll: true
   filegroups:
   - grpc_base
+  - grpc_transport_chttp2_server_secure
+  - grpc_transport_chttp2_client_secure
+  - grpc_transport_chttp2_server_insecure
+  - grpc_transport_chttp2_client_insecure
   - grpc_secure
   - grpc_codegen
   - census
@@ -691,6 +720,8 @@ libs:
   dll: true
   filegroups:
   - grpc_base
+  - grpc_transport_chttp2_server_insecure
+  - grpc_transport_chttp2_client_insecure
   - grpc_codegen
   - census
   - nanopb