diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-26 13:06:03 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-26 13:06:03 -0700 |
| commit | e4e457ed76fd9e23559f0b23e262459fc85e175c (patch) | |
| tree | 207b644c704b1d0ef6bf894fc8d0e8a6e20ee00e /Makefile | |
| parent | bfe56801ad916248f43c2dcfaa96bd7442a65ae2 (diff) | |
| parent | d4a5971ae89e124f67781a6fda57b36af3d7fb54 (diff) | |
Merge remote-tracking branch 'upstream/master' into circular_dependency_fix
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -2747,7 +2747,6 @@ LIBGRPC_SRC = \ src/core/ext/client_channel/resolver.c \ src/core/ext/client_channel/resolver_factory.c \ src/core/ext/client_channel/resolver_registry.c \ - src/core/ext/client_channel/resolver_result.c \ src/core/ext/client_channel/subchannel.c \ src/core/ext/client_channel/subchannel_index.c \ src/core/ext/client_channel/uri_parser.c \ @@ -3012,7 +3011,6 @@ LIBGRPC_CRONET_SRC = \ src/core/ext/client_channel/resolver.c \ src/core/ext/client_channel/resolver_factory.c \ src/core/ext/client_channel/resolver_registry.c \ - src/core/ext/client_channel/resolver_result.c \ src/core/ext/client_channel/subchannel.c \ src/core/ext/client_channel/subchannel_index.c \ src/core/ext/client_channel/uri_parser.c \ @@ -3502,7 +3500,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/client_channel/resolver.c \ src/core/ext/client_channel/resolver_factory.c \ src/core/ext/client_channel/resolver_registry.c \ - src/core/ext/client_channel/resolver_result.c \ src/core/ext/client_channel/subchannel.c \ src/core/ext/client_channel/subchannel_index.c \ src/core/ext/client_channel/uri_parser.c \ |