diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-09-12 11:11:32 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-09-12 11:11:32 -0700 |
| commit | 3951f2e05b44643b5a55f25b3c9233b60c299e83 (patch) | |
| tree | a9a1671edd82586f7e248e425e039cf3cfd47572 /binding.gyp | |
| parent | 75e3ce645c3fbe315a8384c2cc952467826623e0 (diff) | |
| parent | ec5c93cabfbf535be2528df55ca8bb4500e6bc9b (diff) | |
Merge remote-tracking branch 'upstream/master' into cli_list
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index 17dbfc0d38..b4f182c4b7 100644 --- a/binding.gyp +++ b/binding.gyp @@ -515,7 +515,9 @@ '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', 'src/core/lib/support/slice_buffer.c', 'src/core/lib/support/stack_lockfree.c', @@ -578,6 +580,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', @@ -707,7 +710,6 @@ 'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_config/client_channel.c', 'src/core/ext/client_config/client_channel_factory.c', - 'src/core/ext/client_config/client_config.c', 'src/core/ext/client_config/client_config_plugin.c', 'src/core/ext/client_config/connector.c', 'src/core/ext/client_config/default_initial_connect_string.c', @@ -719,8 +721,8 @@ 'src/core/ext/client_config/resolver.c', 'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_config/resolver_registry.c', + 'src/core/ext/client_config/resolver_result.c', 'src/core/ext/client_config/subchannel.c', - 'src/core/ext/client_config/subchannel_call_holder.c', 'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', @@ -742,6 +744,7 @@ 'src/core/ext/census/base_resources.c', 'src/core/ext/census/context.c', 'src/core/ext/census/gen/census.pb.c', + 'src/core/ext/census/gen/trace_context.pb.c', 'src/core/ext/census/grpc_context.c', 'src/core/ext/census/grpc_filter.c', 'src/core/ext/census/grpc_plugin.c', |