diff options
| author |  Vijay Pai <vpai@google.com> | 2015-07-24 10:51:27 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2015-07-24 10:51:27 -0700 |
| commit | f0c66c6365212ec259ad3da6f1127bbc8790136b (patch) | |
| tree | 9078e79ebe764d04d71149ecc829cc0e9e5f8d48 /Makefile | |
| parent | 24b3b7e3d4d0c65cbd729bd29c462765d5a74e34 (diff) | |
| parent | 6aff7aa335c8d33c091ffbe4b99d3f339897de03 (diff) | |
Merge branch 'master' into deepend
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -3520,7 +3520,7 @@ LIBGRPC_SRC = \ src/core/client_config/resolver_factory.c \ src/core/client_config/resolver_registry.c \ src/core/client_config/resolvers/dns_resolver.c \ - src/core/client_config/resolvers/unix_resolver_posix.c \ + src/core/client_config/resolvers/sockaddr_resolver.c \ src/core/client_config/subchannel.c \ src/core/client_config/subchannel_factory.c \ src/core/client_config/uri_parser.c \ @@ -3614,6 +3614,7 @@ LIBGRPC_SRC = \ src/core/transport/transport_op_string.c \ src/core/census/context.c \ src/core/census/initialize.c \ + src/core/census/record_stat.c \ PUBLIC_HEADERS_C += \ include/grpc/grpc_security.h \ @@ -3784,7 +3785,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/client_config/resolver_factory.c \ src/core/client_config/resolver_registry.c \ src/core/client_config/resolvers/dns_resolver.c \ - src/core/client_config/resolvers/unix_resolver_posix.c \ + src/core/client_config/resolvers/sockaddr_resolver.c \ src/core/client_config/subchannel.c \ src/core/client_config/subchannel_factory.c \ src/core/client_config/uri_parser.c \ @@ -3878,6 +3879,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/transport/transport_op_string.c \ src/core/census/context.c \ src/core/census/initialize.c \ + src/core/census/record_stat.c \ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ |