diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
| commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
| tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /grpc.gyp | |
| parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
| parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -431,7 +431,6 @@ 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', @@ -669,7 +668,6 @@ 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', @@ -885,7 +883,6 @@ 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', @@ -1113,7 +1110,6 @@ 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', |