aboutsummaryrefslogtreecommitdiffhomepage
path: root/build.json
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-07-23 11:28:16 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-07-23 11:28:16 -0700
commitb256faa353159c0b6f3477777bed75b4f9de3e16 (patch)
tree75c07077be01aa0120dc7b00dc5bdf88c51c87f6 /build.json
parentb358c41c7e901e170de7621c682b845469f4f667 (diff)
parent5126bb6d8261ef07fb8132d5b5937f149cf315c8 (diff)
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'build.json')
-rw-r--r--build.json10
1 files changed, 6 insertions, 4 deletions
diff --git a/build.json b/build.json
index 3625550ba9..37f2e32c42 100644
--- a/build.json
+++ b/build.json
@@ -18,11 +18,13 @@
"include/grpc/census.h"
],
"headers": [
- "src/core/census/context.h"
+ "src/core/census/context.h",
+ "src/core/census/rpc_stat_id.h"
],
"src": [
"src/core/census/context.c",
- "src/core/census/initialize.c"
+ "src/core/census/initialize.c",
+ "src/core/census/record_stat.c"
]
},
{
@@ -129,7 +131,7 @@
"src/core/client_config/resolver_factory.h",
"src/core/client_config/resolver_registry.h",
"src/core/client_config/resolvers/dns_resolver.h",
- "src/core/client_config/resolvers/unix_resolver_posix.h",
+ "src/core/client_config/resolvers/sockaddr_resolver.h",
"src/core/client_config/subchannel.h",
"src/core/client_config/subchannel_factory.h",
"src/core/client_config/uri_parser.h",
@@ -225,7 +227,7 @@
"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",