Merge pull request #869 from murgatroid99/v1.21.0-pre1_update

Update to v1.21.0-pre1
grpc · May 16, 2019 · 4a5f425 · 4a5f425
2 parents 1d1d2b9 + cbbee32
commit 4a5f425
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
@@ -569,7 +569,6 @@
       ],
       'sources': [
         'deps/grpc/src/core/lib/gpr/alloc.cc',
-        'deps/grpc/src/core/lib/gpr/arena.cc',
         'deps/grpc/src/core/lib/gpr/atm.cc',
         'deps/grpc/src/core/lib/gpr/cpu_iphone.cc',
         'deps/grpc/src/core/lib/gpr/cpu_linux.cc',
@@ -602,7 +601,9 @@
         'deps/grpc/src/core/lib/gpr/tmpfile_posix.cc',
         'deps/grpc/src/core/lib/gpr/tmpfile_windows.cc',
         'deps/grpc/src/core/lib/gpr/wrap_memcpy.cc',
+        'deps/grpc/src/core/lib/gprpp/arena.cc',
         'deps/grpc/src/core/lib/gprpp/fork.cc',
+        'deps/grpc/src/core/lib/gprpp/global_config_env.cc',
         'deps/grpc/src/core/lib/gprpp/thd_posix.cc',
         'deps/grpc/src/core/lib/gprpp/thd_windows.cc',
         'deps/grpc/src/core/lib/profiling/basic_timers.cc',
@@ -638,6 +639,7 @@
         'deps/grpc/src/core/lib/channel/handshaker_registry.cc',
         'deps/grpc/src/core/lib/channel/status_util.cc',
         'deps/grpc/src/core/lib/compression/compression.cc',
+        'deps/grpc/src/core/lib/compression/compression_args.cc',
         'deps/grpc/src/core/lib/compression/compression_internal.cc',
         'deps/grpc/src/core/lib/compression/message_compress.cc',
         'deps/grpc/src/core/lib/compression/stream_compression.cc',
@@ -650,12 +652,15 @@
         'deps/grpc/src/core/lib/http/parser.cc',
         'deps/grpc/src/core/lib/iomgr/buffer_list.cc',
         'deps/grpc/src/core/lib/iomgr/call_combiner.cc',
+        'deps/grpc/src/core/lib/iomgr/cfstream_handle.cc',
         'deps/grpc/src/core/lib/iomgr/combiner.cc',
         'deps/grpc/src/core/lib/iomgr/endpoint.cc',
+        'deps/grpc/src/core/lib/iomgr/endpoint_cfstream.cc',
         'deps/grpc/src/core/lib/iomgr/endpoint_pair_posix.cc',
         'deps/grpc/src/core/lib/iomgr/endpoint_pair_uv.cc',
         'deps/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc',
         'deps/grpc/src/core/lib/iomgr/error.cc',
+        'deps/grpc/src/core/lib/iomgr/error_cfstream.cc',
         'deps/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc',
         'deps/grpc/src/core/lib/iomgr/ev_epollex_linux.cc',
         'deps/grpc/src/core/lib/iomgr/ev_poll_posix.cc',
@@ -676,6 +681,7 @@
         'deps/grpc/src/core/lib/iomgr/iomgr_custom.cc',
         'deps/grpc/src/core/lib/iomgr/iomgr_internal.cc',
         'deps/grpc/src/core/lib/iomgr/iomgr_posix.cc',
+        'deps/grpc/src/core/lib/iomgr/iomgr_posix_cfstream.cc',
         'deps/grpc/src/core/lib/iomgr/iomgr_uv.cc',
         'deps/grpc/src/core/lib/iomgr/iomgr_windows.cc',
         'deps/grpc/src/core/lib/iomgr/is_epollexclusive_available.cc',
@@ -704,6 +710,7 @@
         'deps/grpc/src/core/lib/iomgr/socket_utils_windows.cc',
         'deps/grpc/src/core/lib/iomgr/socket_windows.cc',
         'deps/grpc/src/core/lib/iomgr/tcp_client.cc',
+        'deps/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc',
         'deps/grpc/src/core/lib/iomgr/tcp_client_custom.cc',
         'deps/grpc/src/core/lib/iomgr/tcp_client_posix.cc',
         'deps/grpc/src/core/lib/iomgr/tcp_client_windows.cc',
@@ -937,12 +944,16 @@
         'deps/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv_windows.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
+        'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
         'deps/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
         'deps/grpc/src/core/ext/filters/census/grpc_context.cc',

diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc