diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-07 09:02:28 -0700 |
| commit | 15195741d7758a80bcf901e7db05b3c57654c4a3 (patch) | |
| tree | 1a7cd9f6b80235306559176a34bcf0e5c7ec4407 /binding.gyp | |
| parent | 2137cd8e9b84fd2f602a369ee5922a6fefce2efc (diff) | |
| parent | e5c744d9850a763639b2e7001cf2487e1c76133b (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/binding.gyp b/binding.gyp index 41a97bbf59..c3ae8e0ed7 100644 --- a/binding.gyp +++ b/binding.gyp @@ -515,6 +515,7 @@ 'src/core/lib/support/log_linux.c', 'src/core/lib/support/log_posix.c', 'src/core/lib/support/log_windows.c', + 'src/core/lib/support/mpscq.c', 'src/core/lib/support/murmur_hash.c', 'src/core/lib/support/percent_encoding.c', 'src/core/lib/support/slice.c', @@ -569,9 +570,11 @@ 'src/core/lib/channel/channel_stack_builder.c', 'src/core/lib/channel/compress_filter.c', 'src/core/lib/channel/connected_channel.c', + 'src/core/lib/channel/deadline_filter.c', 'src/core/lib/channel/handshaker.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', + 'src/core/lib/channel/message_size_filter.c', 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/debug/trace.c', @@ -579,6 +582,7 @@ 'src/core/lib/http/httpcli.c', 'src/core/lib/http/parser.c', 'src/core/lib/iomgr/closure.c', + 'src/core/lib/iomgr/combiner.c', 'src/core/lib/iomgr/endpoint.c', 'src/core/lib/iomgr/endpoint_pair_posix.c', 'src/core/lib/iomgr/endpoint_pair_windows.c', @@ -711,6 +715,7 @@ 'src/core/ext/client_channel/client_channel_plugin.c', 'src/core/ext/client_channel/connector.c', 'src/core/ext/client_channel/default_initial_connect_string.c', + 'src/core/ext/client_channel/http_connect_handshaker.c', 'src/core/ext/client_channel/initial_connect_string.c', 'src/core/ext/client_channel/lb_policy.c', 'src/core/ext/client_channel/lb_policy_factory.c', @@ -751,6 +756,7 @@ 'src/core/ext/census/operation.c', 'src/core/ext/census/placeholders.c', 'src/core/ext/census/resource.c', + 'src/core/ext/census/trace_context.c', 'src/core/ext/census/tracing.c', 'src/core/plugin_registry/grpc_plugin_registry.c', ], |