aboutsummaryrefslogtreecommitdiffhomepage
path: root/build.json
diff options
context:
space:
mode:
authorGravatar Siddharth Rakesh <sidrakesh@google.com>2015-06-23 11:22:46 -0700
committerGravatar Siddharth Rakesh <sidrakesh@google.com>2015-06-23 11:22:46 -0700
commit500007ab681bb5a28c340baebeca650157fd8992 (patch)
tree98676fd332b975897df1493068ce1946b4aa95ad /build.json
parent12854eedb58af6fabf8f24192009e2b0b1db315c (diff)
parent04da718e902fa67bbe2b3551ad88ffa636ed31b0 (diff)
Merge branch 'master' of https://github.com/grpc/grpc
Diffstat (limited to 'build.json')
-rw-r--r--build.json33
1 files changed, 32 insertions, 1 deletions
diff --git a/build.json b/build.json
index 8112fc1f0c..76f41550bc 100644
--- a/build.json
+++ b/build.json
@@ -45,6 +45,7 @@
"include/grpc++/impl/internal_stub.h",
"include/grpc++/impl/rpc_method.h",
"include/grpc++/impl/rpc_service_method.h",
+ "include/grpc++/impl/serialization_traits.h",
"include/grpc++/impl/service_type.h",
"include/grpc++/impl/sync.h",
"include/grpc++/impl/sync_cxx11.h",
@@ -72,7 +73,6 @@
"src/cpp/client/channel.cc",
"src/cpp/client/channel_arguments.cc",
"src/cpp/client/client_context.cc",
- "src/cpp/client/client_unary_call.cc",
"src/cpp/client/create_channel.cc",
"src/cpp/client/credentials.cc",
"src/cpp/client/generic_stub.cc",
@@ -133,6 +133,7 @@
"src/core/iomgr/pollset.h",
"src/core/iomgr/pollset_kick_posix.h",
"src/core/iomgr/pollset_posix.h",
+ "src/core/iomgr/pollset_set.h",
"src/core/iomgr/pollset_set_posix.h",
"src/core/iomgr/pollset_set_windows.h",
"src/core/iomgr/pollset_windows.h",
@@ -1833,6 +1834,36 @@
]
},
{
+ "name": "cxx_byte_buffer_test",
+ "build": "test",
+ "language": "c++",
+ "src": [
+ "test/cpp/util/byte_buffer_test.cc"
+ ],
+ "deps": [
+ "grpc_test_util",
+ "grpc++",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
+ },
+ {
+ "name": "cxx_slice_test",
+ "build": "test",
+ "language": "c++",
+ "src": [
+ "test/cpp/util/slice_test.cc"
+ ],
+ "deps": [
+ "grpc_test_util",
+ "grpc++",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
+ },
+ {
"name": "cxx_time_test",
"build": "test",
"language": "c++",