Merge github.com:grpc/grpc into one-pass

Conflicts:
	Makefile

1 files changed, 24 insertions, 495 deletions

diff --git a/Makefile b/Makefile
index 4a8d55b28e..7813d94474 100644
--- a/Makefile
+++ b/Makefile
@@ -348,8 +348,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope
 ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
 PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
 PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
-PROTOC_CMD = which protoc > /dev/null
-PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3
+PROTOC_CHECK_CMD = which protoc > /dev/null
+PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
 
 ifeq ($(OPENSSL_REQUIRES_DL),true)
 OPENSSL_ALPN_CHECK_CMD += -ldl
@@ -375,9 +375,9 @@ HAS_SYSTEM_ZLIB = false
 HAS_SYSTEM_PROTOBUF = false
 endif
 
-HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false)
+HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
 ifeq ($(HAS_PROTOC),true)
-HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
+HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
 else
 HAS_VALID_PROTOC = false
 endif
@@ -1212,7 +1212,7 @@ run_dep_checks:
 	$(ZLIB_CHECK_CMD) || true
 	$(PERFTOOLS_CHECK_CMD) || true
 	$(PROTOBUF_CHECK_CMD) || true
-	$(PROTOC_CHECK_CMD) || true
+	$(PROTOC_CHECK_VERSION_CMD) || true
 
 $(LIBDIR)/$(CONFIG)/zlib/libz.a:
 	$(E) "[MAKE]    Building zlib"
@@ -3101,42 +3101,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGPR_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/support/alloc.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cancellable.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cmdline.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_iphone.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/histogram.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/host_port.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_android.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/murmur_hash.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/slice_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time_win32.o: 
-
 
 LIBGPR_TEST_UTIL_SRC = \
     test/core/util/test_config.c \
@@ -3160,8 +3124,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGPR_TEST_UTIL_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/util/test_config.o: 
-
 
 LIBGRPC_SRC = \
     src/core/httpcli/format_request.c \
@@ -3350,123 +3312,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/format_request.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli_security_connector.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/auth.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/base64.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/google_default_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/json_token.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/secure_endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/secure_transport_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/security_connector.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/server_secure_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init_secure.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/secure_channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/fake_transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/ssl_transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: 
-$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport_op_string.o: 
-
 
 LIBGRPC_TEST_UTIL_SRC = \
     test/core/end2end/data/server1_cert.c \
@@ -3515,18 +3360,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: 
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: 
-
 
 LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     test/core/end2end/cq_verifier.c \
@@ -3558,15 +3391,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: 
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: 
-
 
 LIBGRPC_UNSECURE_SRC = \
     src/core/surface/init_unsecure.c \
@@ -3709,104 +3533,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init_unsecure.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: 
-$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport_op_string.o: 
-
 
 LIBGRPC++_SRC = \
     src/cpp/client/secure_credentials.cc \
@@ -3850,6 +3576,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/generic_stub.h \
     include/grpc++/impl/call.h \
     include/grpc++/impl/client_unary_call.h \
+    include/grpc++/impl/grpc_library.h \
     include/grpc++/impl/internal_stub.h \
     include/grpc++/impl/rpc_method.h \
     include/grpc++/impl/rpc_service_method.h \
@@ -3869,6 +3596,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/status_code_enum.h \
     include/grpc++/stream.h \
     include/grpc++/thread_pool_interface.h \
+    include/grpc++/time.h \
 
 LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
 
@@ -3939,33 +3667,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/secure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/secure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: 
-
 
 LIBGRPC++_TEST_CONFIG_SRC = \
     test/cpp/util/test_config.cc \
@@ -4013,8 +3714,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/util/test_config.o: 
-
 
 LIBGRPC++_TEST_UTIL_SRC = \
     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc \
@@ -4065,12 +3764,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
 
 
 LIBGRPC++_UNSECURE_SRC = \
@@ -4113,6 +3808,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/generic_stub.h \
     include/grpc++/impl/call.h \
     include/grpc++/impl/client_unary_call.h \
+    include/grpc++/impl/grpc_library.h \
     include/grpc++/impl/internal_stub.h \
     include/grpc++/impl/rpc_method.h \
     include/grpc++/impl/rpc_service_method.h \
@@ -4132,6 +3828,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/status_code_enum.h \
     include/grpc++/stream.h \
     include/grpc++/thread_pool_interface.h \
+    include/grpc++/time.h \
 
 LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC))))
 
@@ -4184,31 +3881,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC++_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: 
-
 
 LIBGRPC_PLUGIN_SUPPORT_SRC = \
     src/compiler/cpp_generator.cc \
@@ -4246,11 +3918,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_PLUGIN_SUPPORT_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/compiler/cpp_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/objective_c_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/python_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/ruby_generator.o: 
-
 
 LIBINTEROP_CLIENT_HELPER_SRC = \
     test/cpp/interop/client_helper.cc \
@@ -4298,8 +3965,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client_helper.o: 
-
 
 LIBINTEROP_CLIENT_MAIN_SRC = \
     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \
@@ -4350,12 +4015,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
 
 
 LIBINTEROP_SERVER_HELPER_SRC = \
@@ -4404,8 +4065,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/server_helper.o: 
-
 
 LIBINTEROP_SERVER_MAIN_SRC = \
     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \
@@ -4455,11 +4114,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
 
 
 LIBPUBSUB_CLIENT_LIB_SRC = \
@@ -4511,12 +4166,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBPUBSUB_CLIENT_LIB_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
 
 
 LIBQPS_SRC = \
@@ -4572,16 +4223,14 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBQPS_OBJS:.o=.dep)
 endif
 endif
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
 
 
 LIBGRPC_CSHARP_EXT_SRC = \
@@ -4642,8 +4291,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/csharp/ext/grpc_csharp_ext.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_SRC = \
     test/core/end2end/fixtures/chttp2_fake_security.c \
@@ -4681,8 +4328,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fake_security.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_fullstack.c \
@@ -4706,8 +4351,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_SRC = \
     test/core/end2end/fixtures/chttp2_fullstack_uds.c \
@@ -4731,8 +4374,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack_uds.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c \
@@ -4770,8 +4411,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c \
@@ -4809,8 +4448,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_SRC = \
     test/core/end2end/fixtures/chttp2_socket_pair.c \
@@ -4834,8 +4471,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair.o: 
-
 
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SRC = \
     test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c \
@@ -4859,8 +4494,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.o: 
-
 
 LIBEND2END_TEST_BAD_HOSTNAME_SRC = \
     test/core/end2end/tests/bad_hostname.c \
@@ -4884,8 +4517,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_BAD_HOSTNAME_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/bad_hostname.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_SRC = \
     test/core/end2end/tests/cancel_after_accept.c \
@@ -4909,8 +4540,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_SRC = \
     test/core/end2end/tests/cancel_after_accept_and_writes_closed.c \
@@ -4934,8 +4563,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.c \
@@ -4959,8 +4586,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_accept_legacy.c \
@@ -4984,8 +4609,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_legacy.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_SRC = \
     test/core/end2end/tests/cancel_after_invoke.c \
@@ -5009,8 +4632,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke.o: 
-
 
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_invoke_legacy.c \
@@ -5034,8 +4655,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke_legacy.o: 
-
 
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_SRC = \
     test/core/end2end/tests/cancel_before_invoke.c \
@@ -5059,8 +4678,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke.o: 
-
 
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_SRC = \
     test/core/end2end/tests/cancel_before_invoke_legacy.c \
@@ -5084,8 +4701,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke_legacy.o: 
-
 
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_SRC = \
     test/core/end2end/tests/cancel_in_a_vacuum.c \
@@ -5109,8 +4724,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum.o: 
-
 
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_SRC = \
     test/core/end2end/tests/cancel_in_a_vacuum_legacy.c \
@@ -5134,8 +4747,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum_legacy.o: 
-
 
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_SRC = \
     test/core/end2end/tests/census_simple_request.c \
@@ -5159,8 +4770,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request.o: 
-
 
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/census_simple_request_legacy.c \
@@ -5184,8 +4793,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request_legacy.o: 
-
 
 LIBEND2END_TEST_DISAPPEARING_SERVER_SRC = \
     test/core/end2end/tests/disappearing_server.c \
@@ -5209,8 +4816,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server.o: 
-
 
 LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_SRC = \
     test/core/end2end/tests/disappearing_server_legacy.c \
@@ -5234,8 +4839,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server_legacy.o: 
-
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c \
@@ -5259,8 +4862,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.o: 
-
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.c \
@@ -5284,8 +4885,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.o: 
-
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_tags.c \
@@ -5309,8 +4908,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags.o: 
-
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.c \
@@ -5334,8 +4931,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.o: 
-
 
 LIBEND2END_TEST_EMPTY_BATCH_SRC = \
     test/core/end2end/tests/empty_batch.c \
@@ -5359,8 +4954,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EMPTY_BATCH_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/empty_batch.o: 
-
 
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_SRC = \
     test/core/end2end/tests/graceful_server_shutdown.c \
@@ -5384,8 +4977,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown.o: 
-
 
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_SRC = \
     test/core/end2end/tests/graceful_server_shutdown_legacy.c \
@@ -5409,8 +5000,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown_legacy.o: 
-
 
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_SRC = \
     test/core/end2end/tests/invoke_large_request.c \
@@ -5434,8 +5023,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request.o: 
-
 
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/invoke_large_request_legacy.c \
@@ -5459,8 +5046,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request_legacy.o: 
-
 
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_SRC = \
     test/core/end2end/tests/max_concurrent_streams.c \
@@ -5484,8 +5069,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams.o: 
-
 
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_SRC = \
     test/core/end2end/tests/max_concurrent_streams_legacy.c \
@@ -5509,8 +5092,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams_legacy.o: 
-
 
 LIBEND2END_TEST_NO_OP_SRC = \
     test/core/end2end/tests/no_op.c \
@@ -5534,8 +5115,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_NO_OP_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op.o: 
-
 
 LIBEND2END_TEST_NO_OP_LEGACY_SRC = \
     test/core/end2end/tests/no_op_legacy.c \
@@ -5559,8 +5138,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_NO_OP_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op_legacy.o: 
-
 
 LIBEND2END_TEST_PING_PONG_STREAMING_SRC = \
     test/core/end2end/tests/ping_pong_streaming.c \
@@ -5584,8 +5161,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_PING_PONG_STREAMING_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming.o: 
-
 
 LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_SRC = \
     test/core/end2end/tests/ping_pong_streaming_legacy.c \
@@ -5609,8 +5184,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming_legacy.o: 
-
 
 LIBEND2END_TEST_REGISTERED_CALL_SRC = \
     test/core/end2end/tests/registered_call.c \
@@ -5634,8 +5207,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REGISTERED_CALL_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/registered_call.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c \
@@ -5659,8 +5230,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.c \
@@ -5684,8 +5253,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_metadata_and_payload.c \
@@ -5709,8 +5276,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.c \
@@ -5734,8 +5299,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_payload.c \
@@ -5759,8 +5322,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_payload_legacy.c \
@@ -5784,8 +5345,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload_legacy.o: 
-
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.c \
@@ -5809,8 +5368,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.o: 
-
 
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_SRC = \
     test/core/end2end/tests/request_with_large_metadata.c \
@@ -5834,8 +5391,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata.o: 
-
 
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_SRC = \
     test/core/end2end/tests/request_with_large_metadata_legacy.c \
@@ -5859,8 +5414,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata_legacy.o: 
-
 
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_SRC = \
     test/core/end2end/tests/request_with_payload.c \
@@ -5884,8 +5437,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload.o: 
-
 
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_with_payload_legacy.c \
@@ -5909,8 +5460,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload_legacy.o: 
-
 
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_SRC = \
     test/core/end2end/tests/simple_delayed_request.c \
@@ -5934,8 +5483,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request.o: 
-
 
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/simple_delayed_request_legacy.c \
@@ -5959,8 +5506,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request_legacy.o: 
-
 
 LIBEND2END_TEST_SIMPLE_REQUEST_SRC = \
     test/core/end2end/tests/simple_request.c \
@@ -5984,8 +5529,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request.o: 
-
 
 LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/simple_request_legacy.c \
@@ -6009,8 +5552,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request_legacy.o: 
-
 
 LIBEND2END_TEST_THREAD_STRESS_SRC = \
     test/core/end2end/tests/thread_stress.c \
@@ -6034,8 +5575,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_THREAD_STRESS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress.o: 
-
 
 LIBEND2END_TEST_THREAD_STRESS_LEGACY_SRC = \
     test/core/end2end/tests/thread_stress_legacy.c \
@@ -6059,8 +5598,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_THREAD_STRESS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress_legacy.o: 
-
 
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_SRC = \
     test/core/end2end/tests/writes_done_hangs_with_pending_read.c \
@@ -6084,8 +5621,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read.o: 
-
 
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_SRC = \
     test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.c \
@@ -6109,8 +5644,6 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.o: 
-
 
 LIBEND2END_CERTS_SRC = \
     test/core/end2end/data/test_root_cert.c \
@@ -6150,10 +5683,6 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: 
-
 
 
 # All of the test targets, and protoc plugins