diff options
author | Craig Tiller <ctiller@google.com> | 2017-04-17 08:38:33 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-04-17 08:38:33 -0700 |
commit | 26ec8fba7a04e3b1e322fa789e7512682a39129d (patch) | |
tree | b6a0d0ddf936a96c2f252c7156325ec7aa143e86 /binding.gyp | |
parent | 54d388d0af69aae8ba7716da7f6c3bc8b1768664 (diff) | |
parent | 3ddc13b25212ed02b58aebea36d69424efdfbf79 (diff) |
Merge github.com:grpc/grpc into epex4
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 8847fe8134..da37c432b6 100644 --- a/binding.gyp +++ b/binding.gyp @@ -653,15 +653,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', @@ -799,6 +794,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', @@ -848,6 +847,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', @@ -884,6 +884,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": [ |