diff options
| author |  vjpai <vpai@google.com> | 2015-07-10 19:48:17 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-07-10 19:48:17 -0700 |
| commit | a8822999840a7c550692b372ff93841fa43907bd (patch) | |
| tree | 0feda344bff960f3331f9f222a4cd0316e5e4099 /build.json | |
| parent | 10a6546cb94373b7d57f3cb2d567edfbb0742d7c (diff) | |
| parent | 4547d503d37ade45866688dae3ce291ec8a450bd (diff) | |
Merge branch 'master' into lockfree-stack
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/build.json b/build.json index 622c0e129a..e21efde74d 100644 --- a/build.json +++ b/build.json @@ -30,6 +30,7 @@ "public_headers": [ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", + "include/grpc++/auth_context.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -68,6 +69,7 @@ ], "headers": [ "src/cpp/client/channel.h", + "src/cpp/common/create_auth_context.h", "src/cpp/server/thread_pool.h" ], "src": [ @@ -285,6 +287,7 @@ "src/core/surface/server_chttp2.c", "src/core/surface/server_create.c", "src/core/surface/surface_trace.c", + "src/core/surface/version.c", "src/core/transport/chttp2/alpn.c", "src/core/transport/chttp2/bin_encoder.c", "src/core/transport/chttp2/frame_data.c", @@ -561,11 +564,14 @@ "language": "c++", "headers": [ "src/cpp/client/secure_credentials.h", + "src/cpp/common/secure_auth_context.h", "src/cpp/server/secure_server_credentials.h" ], "src": [ "src/cpp/client/secure_channel_arguments.cc", "src/cpp/client/secure_credentials.cc", + "src/cpp/common/secure_auth_context.cc", + "src/cpp/common/secure_create_auth_context.cc", "src/cpp/server/secure_server_credentials.cc" ], "deps": [ @@ -618,6 +624,9 @@ "name": "grpc++_unsecure", "build": "all", "language": "c++", + "src": [ + "src/cpp/common/insecure_create_auth_context.cc" + ], "deps": [ "gpr", "grpc_unsecure" @@ -2300,11 +2309,11 @@ ] }, { - "name": "qps_test", + "name": "qps_openloop_test", "build": "test", "language": "c++", "src": [ - "test/cpp/qps/qps_test.cc" + "test/cpp/qps/qps_openloop_test.cc" ], "deps": [ "qps", @@ -2318,11 +2327,11 @@ ] }, { - "name": "qps_test_openloop", + "name": "qps_test", "build": "test", "language": "c++", "src": [ - "test/cpp/qps/qps_test_openloop.cc" + "test/cpp/qps/qps_test.cc" ], "deps": [ "qps", @@ -2358,6 +2367,19 @@ ] }, { + "name": "secure_auth_context_test", + "build": "test", + "language": "c++", + "src": [ + "test/cpp/common/secure_auth_context_test.cc" + ], + "deps": [ + "grpc++", + "grpc", + "gpr" + ] + }, + { "name": "server_crash_test", "build": "test", "language": "c++", |