diff options
author | Yuchen Zeng <y-zeng@users.noreply.github.com> | 2017-04-25 11:08:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-25 11:08:04 -0700 |
commit | 79759fea1abd09102d38af3e13a84b69e898124b (patch) | |
tree | 4ac7c385d528d08d9e2d6d44bb38eec8402f5802 /binding.gyp | |
parent | dc36f4df6aba60275a31227e1d29c4d20b6cadca (diff) | |
parent | b864e7c41c6d0363e23093fb090625f260994962 (diff) |
Merge branch 'master' into v1.3.x
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 e3b2a925a3..45d0f71949 100644 --- a/binding.gyp +++ b/binding.gyp @@ -666,15 +666,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', @@ -811,6 +806,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', @@ -860,6 +859,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', @@ -896,6 +896,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": [ |