diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 16:38:32 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 16:38:32 -0700 |
| commit | 0b488f7649065ad6f00cabbbb617a05dfc7a92e3 (patch) | |
| tree | 7a9381245a9913b6123910a531a0d1a20a463a14 /build.json | |
| parent | 2be6095c10353fbcdfbdec50e269775c1a42641d (diff) | |
| parent | b8b59b18f2585b602a8c4282ebaf4d5c8bef473a (diff) | |
Merge github.com:grpc/grpc into churn-churn-churn-the-api-gently-down-the-stream
Conflicts:
test/cpp/end2end/async_end2end_test.cc
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build.json b/build.json index 88cacc9365..86a063a5fd 100644 --- a/build.json +++ b/build.json @@ -563,6 +563,8 @@ "src/compiler/config.h", "src/compiler/cpp_generator.h", "src/compiler/cpp_generator_helpers.h", + "src/compiler/csharp_generator.h", + "src/compiler/csharp_generator_helpers.h", "src/compiler/generator_helpers.h", "src/compiler/objective_c_generator.h", "src/compiler/objective_c_generator_helpers.h", @@ -574,6 +576,7 @@ ], "src": [ "src/compiler/cpp_generator.cc", + "src/compiler/csharp_generator.cc", "src/compiler/objective_c_generator.cc", "src/compiler/python_generator.cc", "src/compiler/ruby_generator.cc" @@ -1932,6 +1935,18 @@ "secure": "no" }, { + "name": "grpc_csharp_plugin", + "build": "protoc", + "language": "c++", + "src": [ + "src/compiler/csharp_plugin.cc" + ], + "deps": [ + "grpc_plugin_support" + ], + "secure": "no" + }, + { "name": "grpc_objective_c_plugin", "build": "protoc", "language": "c++", |