diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-09-16 13:44:28 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-09-16 13:44:28 -0700 |
| commit | bcc60f75d4b152c4e2eb000bece542f052770bfc (patch) | |
| tree | 34806913186d762d45d1014b2ea8c4d4d37188aa /binding.gyp | |
| parent | 232ca0275e9fb82fe7bb25b03fc2402e8c1ee815 (diff) | |
| parent | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (diff) | |
Merge branch 'master' into uv_core_transport
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 ea585464c3..eda6844045 100644 --- a/binding.gyp +++ b/binding.gyp @@ -518,7 +518,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', @@ -581,6 +583,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', @@ -720,7 +723,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', @@ -732,8 +734,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', @@ -755,6 +757,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', |