Merge branch 'master' into fix_alarm

1 files changed, 385 insertions, 310 deletions

diff --git a/build.yaml b/build.yaml
index b0a46a7b10..b922c82728 100644
--- a/build.yaml
+++ b/build.yaml
@@ -59,52 +59,6 @@ filegroups:
   - grpc_base
   - nanopb
 - name: gpr_base
-  public_headers:
-  - include/grpc/support/alloc.h
-  - include/grpc/support/atm.h
-  - include/grpc/support/atm_gcc_atomic.h
-  - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_windows.h
-  - include/grpc/support/avl.h
-  - include/grpc/support/cmdline.h
-  - include/grpc/support/cpu.h
-  - include/grpc/support/histogram.h
-  - include/grpc/support/host_port.h
-  - include/grpc/support/log.h
-  - include/grpc/support/log_windows.h
-  - include/grpc/support/port_platform.h
-  - include/grpc/support/string_util.h
-  - include/grpc/support/subprocess.h
-  - include/grpc/support/sync.h
-  - include/grpc/support/sync_generic.h
-  - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_windows.h
-  - include/grpc/support/thd.h
-  - include/grpc/support/time.h
-  - include/grpc/support/tls.h
-  - include/grpc/support/tls_gcc.h
-  - include/grpc/support/tls_msvc.h
-  - include/grpc/support/tls_pthread.h
-  - include/grpc/support/useful.h
-  headers:
-  - src/core/lib/profiling/timers.h
-  - src/core/lib/support/arena.h
-  - src/core/lib/support/atomic.h
-  - src/core/lib/support/atomic_with_atm.h
-  - src/core/lib/support/atomic_with_std.h
-  - src/core/lib/support/backoff.h
-  - src/core/lib/support/block_annotate.h
-  - src/core/lib/support/env.h
-  - src/core/lib/support/memory.h
-  - src/core/lib/support/mpscq.h
-  - src/core/lib/support/murmur_hash.h
-  - src/core/lib/support/spinlock.h
-  - src/core/lib/support/stack_lockfree.h
-  - src/core/lib/support/string.h
-  - src/core/lib/support/string_windows.h
-  - src/core/lib/support/thd_internal.h
-  - src/core/lib/support/time_precise.h
-  - src/core/lib/support/tmpfile.h
   src:
   - src/core/lib/profiling/basic_timers.c
   - src/core/lib/profiling/stap_timers.c
@@ -153,6 +107,55 @@ filegroups:
   - src/core/lib/support/tmpfile_windows.c
   - src/core/lib/support/wrap_memcpy.c
   uses:
+  - gpr_base_headers
+- name: gpr_base_headers
+  public_headers:
+  - include/grpc/support/alloc.h
+  - include/grpc/support/atm.h
+  - include/grpc/support/atm_gcc_atomic.h
+  - include/grpc/support/atm_gcc_sync.h
+  - include/grpc/support/atm_windows.h
+  - include/grpc/support/avl.h
+  - include/grpc/support/cmdline.h
+  - include/grpc/support/cpu.h
+  - include/grpc/support/histogram.h
+  - include/grpc/support/host_port.h
+  - include/grpc/support/log.h
+  - include/grpc/support/log_windows.h
+  - include/grpc/support/port_platform.h
+  - include/grpc/support/string_util.h
+  - include/grpc/support/subprocess.h
+  - include/grpc/support/sync.h
+  - include/grpc/support/sync_generic.h
+  - include/grpc/support/sync_posix.h
+  - include/grpc/support/sync_windows.h
+  - include/grpc/support/thd.h
+  - include/grpc/support/time.h
+  - include/grpc/support/tls.h
+  - include/grpc/support/tls_gcc.h
+  - include/grpc/support/tls_msvc.h
+  - include/grpc/support/tls_pthread.h
+  - include/grpc/support/useful.h
+  headers:
+  - src/core/lib/profiling/timers.h
+  - src/core/lib/support/arena.h
+  - src/core/lib/support/atomic.h
+  - src/core/lib/support/atomic_with_atm.h
+  - src/core/lib/support/atomic_with_std.h
+  - src/core/lib/support/backoff.h
+  - src/core/lib/support/block_annotate.h
+  - src/core/lib/support/env.h
+  - src/core/lib/support/memory.h
+  - src/core/lib/support/mpscq.h
+  - src/core/lib/support/murmur_hash.h
+  - src/core/lib/support/spinlock.h
+  - src/core/lib/support/stack_lockfree.h
+  - src/core/lib/support/string.h
+  - src/core/lib/support/string_windows.h
+  - src/core/lib/support/thd_internal.h
+  - src/core/lib/support/time_precise.h
+  - src/core/lib/support/tmpfile.h
+  uses:
   - gpr_codegen
 - name: gpr_codegen
   public_headers:
@@ -167,132 +170,19 @@ filegroups:
   - include/grpc/impl/codegen/sync_generic.h
   - include/grpc/impl/codegen/sync_posix.h
   - include/grpc/impl/codegen/sync_windows.h
+- name: grpc++_base
+  deps:
+  - grpc
+  uses:
+  - grpc++_common
+  - grpc++_codegen_base
+- name: grpc++_base_unsecure
+  deps:
+  - grpc_unsecure
+  uses:
+  - grpc++_common
+  - grpc++_codegen_base
 - name: grpc_base
-  public_headers:
-  - include/grpc/byte_buffer.h
-  - include/grpc/byte_buffer_reader.h
-  - include/grpc/compression.h
-  - include/grpc/grpc.h
-  - include/grpc/grpc_posix.h
-  - include/grpc/grpc_security_constants.h
-  - include/grpc/load_reporting.h
-  - include/grpc/slice.h
-  - include/grpc/slice_buffer.h
-  - include/grpc/status.h
-  - include/grpc/support/workaround_list.h
-  headers:
-  - 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/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/compression/algorithm_metadata.h
-  - src/core/lib/compression/message_compress.h
-  - src/core/lib/compression/stream_compression.h
-  - src/core/lib/http/format_request.h
-  - src/core/lib/http/httpcli.h
-  - src/core/lib/http/parser.h
-  - src/core/lib/iomgr/closure.h
-  - src/core/lib/iomgr/combiner.h
-  - src/core/lib/iomgr/endpoint.h
-  - src/core/lib/iomgr/endpoint_pair.h
-  - src/core/lib/iomgr/error.h
-  - src/core/lib/iomgr/error_internal.h
-  - src/core/lib/iomgr/ev_epoll1_linux.h
-  - src/core/lib/iomgr/ev_epoll_limited_pollers_linux.h
-  - src/core/lib/iomgr/ev_epoll_thread_pool_linux.h
-  - src/core/lib/iomgr/ev_epollex_linux.h
-  - src/core/lib/iomgr/ev_epollsig_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/iocp_windows.h
-  - src/core/lib/iomgr/iomgr.h
-  - src/core/lib/iomgr/iomgr_internal.h
-  - src/core/lib/iomgr/iomgr_posix.h
-  - src/core/lib/iomgr/iomgr_uv.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/network_status_tracker.h
-  - src/core/lib/iomgr/polling_entity.h
-  - src/core/lib/iomgr/pollset.h
-  - src/core/lib/iomgr/pollset_set.h
-  - src/core/lib/iomgr/pollset_set_windows.h
-  - src/core/lib/iomgr/pollset_uv.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/resource_quota.h
-  - src/core/lib/iomgr/sockaddr.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_posix.h
-  - src/core/lib/iomgr/tcp_server.h
-  - src/core/lib/iomgr/tcp_server_utils_posix.h
-  - src/core/lib/iomgr/tcp_uv.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_generic.h
-  - src/core/lib/iomgr/timer_heap.h
-  - src/core/lib/iomgr/timer_manager.h
-  - src/core/lib/iomgr/timer_uv.h
-  - src/core/lib/iomgr/udp_server.h
-  - src/core/lib/iomgr/unix_sockets_posix.h
-  - src/core/lib/iomgr/wakeup_fd_cv.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/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/surface/alarm_internal.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/service_config.h
-  - src/core/lib/transport/static_metadata.h
-  - src/core/lib/transport/status_conversion.h
-  - src/core/lib/transport/timeout_encoding.h
-  - src/core/lib/transport/transport.h
-  - src/core/lib/transport/transport_impl.h
   src:
   - src/core/lib/channel/channel_args.c
   - src/core/lib/channel/channel_stack.c
@@ -421,9 +311,143 @@ filegroups:
   - src/core/lib/transport/transport_op_string.c
   deps:
   - gpr
+  filegroups:
+  - grpc_base_headers
   uses:
   - grpc_codegen
   - grpc_trace
+- name: grpc_base_headers
+  public_headers:
+  - include/grpc/byte_buffer.h
+  - include/grpc/byte_buffer_reader.h
+  - include/grpc/compression.h
+  - include/grpc/grpc.h
+  - include/grpc/grpc_posix.h
+  - include/grpc/grpc_security_constants.h
+  - include/grpc/load_reporting.h
+  - include/grpc/slice.h
+  - include/grpc/slice_buffer.h
+  - include/grpc/status.h
+  - include/grpc/support/workaround_list.h
+  headers:
+  - 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/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/compression/algorithm_metadata.h
+  - src/core/lib/compression/message_compress.h
+  - src/core/lib/compression/stream_compression.h
+  - src/core/lib/http/format_request.h
+  - src/core/lib/http/httpcli.h
+  - src/core/lib/http/parser.h
+  - src/core/lib/iomgr/closure.h
+  - src/core/lib/iomgr/combiner.h
+  - src/core/lib/iomgr/endpoint.h
+  - src/core/lib/iomgr/endpoint_pair.h
+  - src/core/lib/iomgr/error.h
+  - src/core/lib/iomgr/error_internal.h
+  - src/core/lib/iomgr/ev_epoll1_linux.h
+  - src/core/lib/iomgr/ev_epoll_limited_pollers_linux.h
+  - src/core/lib/iomgr/ev_epoll_thread_pool_linux.h
+  - src/core/lib/iomgr/ev_epollex_linux.h
+  - src/core/lib/iomgr/ev_epollsig_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/iocp_windows.h
+  - src/core/lib/iomgr/iomgr.h
+  - src/core/lib/iomgr/iomgr_internal.h
+  - src/core/lib/iomgr/iomgr_posix.h
+  - src/core/lib/iomgr/iomgr_uv.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/nameser.h
+  - src/core/lib/iomgr/network_status_tracker.h
+  - src/core/lib/iomgr/polling_entity.h
+  - src/core/lib/iomgr/pollset.h
+  - src/core/lib/iomgr/pollset_set.h
+  - src/core/lib/iomgr/pollset_set_windows.h
+  - src/core/lib/iomgr/pollset_uv.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/resource_quota.h
+  - src/core/lib/iomgr/sockaddr.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_posix.h
+  - src/core/lib/iomgr/tcp_server.h
+  - src/core/lib/iomgr/tcp_server_utils_posix.h
+  - src/core/lib/iomgr/tcp_uv.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_generic.h
+  - src/core/lib/iomgr/timer_heap.h
+  - src/core/lib/iomgr/timer_manager.h
+  - src/core/lib/iomgr/timer_uv.h
+  - src/core/lib/iomgr/udp_server.h
+  - src/core/lib/iomgr/unix_sockets_posix.h
+  - src/core/lib/iomgr/wakeup_fd_cv.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/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/surface/alarm_internal.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/service_config.h
+  - src/core/lib/transport/static_metadata.h
+  - src/core/lib/transport/status_conversion.h
+  - src/core/lib/transport/timeout_encoding.h
+  - src/core/lib/transport/transport.h
+  - src/core/lib/transport/transport_impl.h
+  deps:
+  - gpr
+  uses:
+  - grpc_codegen
+  - grpc_trace_headers
 - name: grpc_client_channel
   headers:
   - src/core/ext/filters/client_channel/client_channel.h
@@ -716,15 +740,23 @@ filegroups:
   - test/core/util/slice_splitter.c
   - test/core/util/trickle_endpoint.c
   deps:
-  - grpc
   - gpr_test_util
+  uses:
+  - grpc_base
+  - grpc_client_channel
+  - grpc_transport_chttp2
 - name: grpc_trace
-  headers:
-  - src/core/lib/debug/trace.h
   src:
   - src/core/lib/debug/trace.c
   deps:
   - gpr
+  filegroups:
+  - grpc_trace_headers
+- name: grpc_trace_headers
+  headers:
+  - src/core/lib/debug/trace.h
+  deps:
+  - gpr
 - name: grpc_transport_chttp2
   headers:
   - src/core/ext/transport/chttp2/transport/bin_decoder.h
@@ -848,14 +880,18 @@ filegroups:
   - grpc_transport_chttp2
   - grpc_http_filters
 - name: grpc_transport_inproc
-  headers:
-  - src/core/ext/transport/inproc/inproc_transport.h
   src:
   - src/core/ext/transport/inproc/inproc_plugin.c
   - src/core/ext/transport/inproc/inproc_transport.c
   plugin: grpc_inproc_plugin
   uses:
+  - grpc_transport_inproc_headers
   - grpc_base
+- name: grpc_transport_inproc_headers
+  headers:
+  - src/core/ext/transport/inproc/inproc_transport.h
+  uses:
+  - grpc_base_headers
 - name: grpc_workaround_cronet_compression_filter
   headers:
   - src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h
@@ -866,15 +902,18 @@ filegroups:
   - grpc_base
   - grpc_server_backward_compatibility
 - name: nanopb
+  src:
+  - third_party/nanopb/pb_common.c
+  - third_party/nanopb/pb_decode.c
+  - third_party/nanopb/pb_encode.c
+  filegroups:
+  - nanopb_headers
+- name: nanopb_headers
   headers:
   - third_party/nanopb/pb.h
   - third_party/nanopb/pb_common.h
   - third_party/nanopb/pb_decode.h
   - third_party/nanopb/pb_encode.h
-  src:
-  - third_party/nanopb/pb_common.c
-  - third_party/nanopb/pb_decode.c
-  - third_party/nanopb/pb_encode.c
 - name: tsi
   headers:
   - src/core/tsi/fake_transport_security.h
@@ -897,7 +936,54 @@ filegroups:
   uses:
   - grpc_trace
   - grpc_base
-- name: grpc++_base
+- name: grpc++_codegen_base
+  language: c++
+  public_headers:
+  - include/grpc++/impl/codegen/async_stream.h
+  - include/grpc++/impl/codegen/async_unary_call.h
+  - include/grpc++/impl/codegen/call.h
+  - include/grpc++/impl/codegen/call_hook.h
+  - include/grpc++/impl/codegen/channel_interface.h
+  - include/grpc++/impl/codegen/client_context.h
+  - include/grpc++/impl/codegen/client_unary_call.h
+  - include/grpc++/impl/codegen/completion_queue.h
+  - include/grpc++/impl/codegen/completion_queue_tag.h
+  - include/grpc++/impl/codegen/config.h
+  - include/grpc++/impl/codegen/core_codegen_interface.h
+  - include/grpc++/impl/codegen/create_auth_context.h
+  - include/grpc++/impl/codegen/grpc_library.h
+  - include/grpc++/impl/codegen/metadata_map.h
+  - include/grpc++/impl/codegen/method_handler_impl.h
+  - include/grpc++/impl/codegen/rpc_method.h
+  - include/grpc++/impl/codegen/rpc_service_method.h
+  - include/grpc++/impl/codegen/security/auth_context.h
+  - include/grpc++/impl/codegen/serialization_traits.h
+  - include/grpc++/impl/codegen/server_context.h
+  - include/grpc++/impl/codegen/server_interface.h
+  - include/grpc++/impl/codegen/service_type.h
+  - include/grpc++/impl/codegen/slice.h
+  - include/grpc++/impl/codegen/status.h
+  - include/grpc++/impl/codegen/status_code_enum.h
+  - include/grpc++/impl/codegen/string_ref.h
+  - include/grpc++/impl/codegen/stub_options.h
+  - include/grpc++/impl/codegen/sync_stream.h
+  - include/grpc++/impl/codegen/time.h
+  uses:
+  - grpc_codegen
+- name: grpc++_codegen_base_src
+  language: c++
+  src:
+  - src/cpp/codegen/codegen_init.cc
+  uses:
+  - grpc++_codegen_base
+- name: grpc++_codegen_proto
+  language: c++
+  public_headers:
+  - include/grpc++/impl/codegen/proto_utils.h
+  uses:
+  - grpc++_codegen_base
+  - grpc++_config_proto
+- name: grpc++_common
   language: c++
   public_headers:
   - include/grpc++/alarm.h
@@ -987,58 +1073,12 @@ filegroups:
   - src/cpp/util/status.cc
   - src/cpp/util/string_ref.cc
   - src/cpp/util/time_cc.cc
-  deps:
-  - grpc
   uses:
+  - gpr_base_headers
+  - grpc_base_headers
+  - grpc_transport_inproc_headers
   - grpc++_codegen_base
-  - nanopb
-- name: grpc++_codegen_base
-  language: c++
-  public_headers:
-  - include/grpc++/impl/codegen/async_stream.h
-  - include/grpc++/impl/codegen/async_unary_call.h
-  - include/grpc++/impl/codegen/call.h
-  - include/grpc++/impl/codegen/call_hook.h
-  - include/grpc++/impl/codegen/channel_interface.h
-  - include/grpc++/impl/codegen/client_context.h
-  - include/grpc++/impl/codegen/client_unary_call.h
-  - include/grpc++/impl/codegen/completion_queue.h
-  - include/grpc++/impl/codegen/completion_queue_tag.h
-  - include/grpc++/impl/codegen/config.h
-  - include/grpc++/impl/codegen/core_codegen_interface.h
-  - include/grpc++/impl/codegen/create_auth_context.h
-  - include/grpc++/impl/codegen/grpc_library.h
-  - include/grpc++/impl/codegen/metadata_map.h
-  - include/grpc++/impl/codegen/method_handler_impl.h
-  - include/grpc++/impl/codegen/rpc_method.h
-  - include/grpc++/impl/codegen/rpc_service_method.h
-  - include/grpc++/impl/codegen/security/auth_context.h
-  - include/grpc++/impl/codegen/serialization_traits.h
-  - include/grpc++/impl/codegen/server_context.h
-  - include/grpc++/impl/codegen/server_interface.h
-  - include/grpc++/impl/codegen/service_type.h
-  - include/grpc++/impl/codegen/slice.h
-  - include/grpc++/impl/codegen/status.h
-  - include/grpc++/impl/codegen/status_code_enum.h
-  - include/grpc++/impl/codegen/string_ref.h
-  - include/grpc++/impl/codegen/stub_options.h
-  - include/grpc++/impl/codegen/sync_stream.h
-  - include/grpc++/impl/codegen/time.h
-  uses:
-  - grpc_codegen
-- name: grpc++_codegen_base_src
-  language: c++
-  src:
-  - src/cpp/codegen/codegen_init.cc
-  uses:
-  - grpc++_codegen_base
-- name: grpc++_codegen_proto
-  language: c++
-  public_headers:
-  - include/grpc++/impl/codegen/proto_utils.h
-  uses:
-  - grpc++_codegen_base
-  - grpc++_config_proto
+  - nanopb_headers
 - name: grpc++_config_proto
   language: c++
   public_headers:
@@ -1166,7 +1206,6 @@ libs:
   - grpc
   filegroups:
   - grpc_test_util_base
-  - grpc_base
   vs_project_guid: '{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}'
 - name: grpc_test_util_unsecure
   build: private
@@ -1363,6 +1402,32 @@ libs:
   - grpc++_codegen_base_src
   - grpc++_codegen_proto
   - grpc++_config_proto
+- name: grpc++_test_util_unsecure
+  build: private
+  language: c++
+  headers:
+  - test/cpp/end2end/test_service_impl.h
+  - test/cpp/util/byte_buffer_proto_helper.h
+  - test/cpp/util/string_ref_helper.h
+  - test/cpp/util/subprocess.h
+  src:
+  - src/proto/grpc/health/v1/health.proto
+  - src/proto/grpc/testing/echo_messages.proto
+  - src/proto/grpc/testing/echo.proto
+  - src/proto/grpc/testing/duplicate/echo_duplicate.proto
+  - test/cpp/end2end/test_service_impl.cc
+  - test/cpp/util/byte_buffer_proto_helper.cc
+  - test/cpp/util/string_ref_helper.cc
+  - test/cpp/util/subprocess.cc
+  deps:
+  - grpc++_unsecure
+  - grpc_test_util_unsecure
+  - grpc_unsecure
+  filegroups:
+  - grpc++_codegen_base
+  - grpc++_codegen_base_src
+  - grpc++_codegen_proto
+  - grpc++_config_proto
 - name: grpc++_unsecure
   build: all
   language: c++
@@ -1376,7 +1441,7 @@ libs:
   baselib: true
   dll: true
   filegroups:
-  - grpc++_base
+  - grpc++_base_unsecure
   - grpc++_codegen_base
   - grpc++_codegen_base_src
   secure: false
@@ -1392,9 +1457,9 @@ libs:
   - test/cpp/microbenchmarks/helpers.cc
   deps:
   - benchmark
-  - grpc++
-  - grpc_test_util
-  - grpc
+  - grpc++_unsecure
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   defaults: benchmark
 - name: grpc_cli_libs
   build: private
@@ -1703,6 +1768,16 @@ targets:
   deps:
   - grpc_test_util
   - grpc
+- name: byte_stream_test
+  build: test
+  language: c
+  src:
+  - test/core/transport/byte_stream_test.c
+  deps:
+  - grpc_test_util
+  - grpc
+  - gpr_test_util
+  - gpr
 - name: census_context_test
   build: test
   language: c
@@ -3264,10 +3339,10 @@ targets:
   src:
   - test/cpp/common/alarm_cpp_test.cc
   deps:
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
 - name: async_end2end_test
@@ -3304,10 +3379,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3325,10 +3400,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3346,10 +3421,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3367,10 +3442,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3388,10 +3463,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3409,10 +3484,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3430,10 +3505,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3451,10 +3526,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3472,10 +3547,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3497,10 +3572,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3522,10 +3597,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3547,10 +3622,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3572,10 +3647,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -3593,10 +3668,10 @@ targets:
   deps:
   - grpc_benchmark
   - benchmark
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   args:
@@ -4339,11 +4414,11 @@ targets:
   - src/proto/grpc/testing/echo.proto
   - test/cpp/server/server_builder_test.cc
   deps:
-  - grpc++_test_util
-  - grpc_test_util
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
   - gpr_test_util
-  - grpc++
-  - grpc
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr
 - name: server_context_test_spouse_test
   gtest: true
@@ -4399,11 +4474,11 @@ targets:
   - src/proto/grpc/testing/echo.proto
   - test/cpp/server/server_request_call_test.cc
   deps:
-  - grpc++_test_util
-  - grpc_test_util
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
   - gpr_test_util
-  - grpc++
-  - grpc
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr
 - name: shutdown_test
   gtest: true
@@ -4479,8 +4554,8 @@ targets:
   src:
   - test/cpp/thread_manager/thread_manager_test.cc
   deps:
-  - grpc++
-  - grpc
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr
   - grpc++_test_config
 - name: thread_stress_test
@@ -4491,10 +4566,10 @@ targets:
   src:
   - test/cpp/end2end/thread_stress_test.cc
   deps:
-  - grpc++_test_util
-  - grpc_test_util
-  - grpc++
-  - grpc
+  - grpc++_test_util_unsecure
+  - grpc_test_util_unsecure
+  - grpc++_unsecure
+  - grpc_unsecure
   - gpr_test_util
   - gpr
   timeout_seconds: 1200