diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-06 09:10:09 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-06 09:10:09 -0700 |
| commit | 71d6ce65d4f69e289f40c5c5f38928091285d46e (patch) | |
| tree | 1f73a682a8a3116991359cf21878edfa7f650f9f /binding.gyp | |
| parent | 3bd7a2111ed9ada00868ffc8c5175228262194e3 (diff) | |
Merge deadline_init/deadline_start
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index 21cd56e684..cb12489e41 100644 --- a/binding.gyp +++ b/binding.gyp @@ -649,7 +649,6 @@ ], 'sources': [ 'src/core/lib/surface/init.c', - 'src/core/ext/filters/deadline/deadline_filter.c', 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', 'src/core/lib/channel/channel_stack_builder.c', @@ -792,8 +791,8 @@ '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/message_compress/message_compress_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', @@ -844,6 +843,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', |