diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-04-01 16:17:22 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-04-01 16:17:22 -0700 |
| commit | 414ee3208f4998c057cb40bfb612352b7c1675b0 (patch) | |
| tree | 57ce29edbcb89e86d92ec7b7b204804f2472b952 /binding.gyp | |
| parent | b48dda25913fbf6fcb0a7c86ecc364beb31ff43b (diff) | |
| parent | 1895835ecd20c5cd23c2f2f40efe33d23da67487 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel
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 1abfc3c08a..8b53b43686 100644 --- a/binding.gyp +++ b/binding.gyp @@ -571,6 +571,8 @@ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c', 'src/core/ext/lb_policy/pick_first/pick_first.c', 'src/core/ext/lb_policy/round_robin/round_robin.c', + 'src/core/ext/resolver/dns/native/dns_resolver.c', + 'src/core/ext/resolver/sockaddr/sockaddr_resolver.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', @@ -616,8 +618,6 @@ 'src/core/lib/client_config/resolver.c', 'src/core/lib/client_config/resolver_factory.c', 'src/core/lib/client_config/resolver_registry.c', - 'src/core/lib/client_config/resolvers/dns_resolver.c', - 'src/core/lib/client_config/resolvers/sockaddr_resolver.c', 'src/core/lib/client_config/subchannel.c', 'src/core/lib/client_config/subchannel_index.c', 'src/core/lib/client_config/uri_parser.c', |