diff options
author | murgatroid99 <mlumish@google.com> | 2017-04-25 12:15:53 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2017-04-25 12:15:53 -0700 |
commit | 3049462b75ac557348243601896ed68ca8145522 (patch) | |
tree | 213389dd32b961b25f3833738201e857ce7ae2e3 /binding.gyp | |
parent | 627e2a5abd2e4146c85625e98083a95846ad57e8 (diff) | |
parent | 79759fea1abd09102d38af3e13a84b69e898124b (diff) |
Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/binding.gyp b/binding.gyp index a449730d21..8184371a3b 100644 --- a/binding.gyp +++ b/binding.gyp @@ -657,15 +657,10 @@ 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', '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/handshaker_factory.c', 'src/core/lib/channel/handshaker_registry.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', @@ -802,6 +797,10 @@ 'src/core/ext/transport/chttp2/transport/varint.c', 'src/core/ext/transport/chttp2/transport/writing.c', 'src/core/ext/transport/chttp2/alpn/alpn.c', + 'src/core/ext/filters/http/client/http_client_filter.c', + 'src/core/ext/filters/http/http_filters_plugin.c', + 'src/core/ext/filters/http/message_compress/message_compress_filter.c', + 'src/core/ext/filters/http/server/http_server_filter.c', 'src/core/lib/http/httpcli_security_connector.c', 'src/core/lib/security/context/security_context.c', 'src/core/lib/security/credentials/composite/composite_credentials.c', @@ -851,6 +850,7 @@ 'src/core/ext/filters/client_channel/subchannel.c', 'src/core/ext/filters/client_channel/subchannel_index.c', 'src/core/ext/filters/client_channel/uri_parser.c', + 'src/core/ext/filters/deadline/deadline_filter.c', 'src/core/ext/transport/chttp2/client/chttp2_connector.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', @@ -887,6 +887,7 @@ 'src/core/ext/census/trace_context.c', 'src/core/ext/census/tracing.c', 'src/core/ext/filters/max_age/max_age_filter.c', + 'src/core/ext/filters/message_size/message_size_filter.c', 'src/core/plugin_registry/grpc_plugin_registry.c', ], "conditions": [ |