Add gRPC C++ on Android Kokoro build
diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl
index 94781ed..5216a7a 100644
--- a/bazel/cc_grpc_library.bzl
+++ b/bazel/cc_grpc_library.bzl
@@ -2,7 +2,7 @@
load("//:bazel/generate_cc.bzl", "generate_cc")
-def cc_grpc_library(name, srcs, deps, proto_only, well_known_protos, generate_mock, use_external = False, **kwargs):
+def cc_grpc_library(name, srcs, deps, proto_only, well_known_protos, generate_mocks = False, use_external = False, **kwargs):
"""Generates C++ grpc classes from a .proto file.
Assumes the generated classes will be used in cc_api_version = 2.
@@ -16,7 +16,7 @@
protos
use_external: When True the grpc deps are prefixed with //external. This
allows grpc to be used as a dependency in other bazel projects.
- generate_mock: When true GMOCk code for client stub is generated.
+ generate_mocks: When True, Google Mock code for client stub is generated.
**kwargs: rest of arguments, e.g., compatible_with and visibility.
"""
if len(srcs) > 1:
@@ -54,7 +54,7 @@
srcs = [proto_target],
plugin = plugin,
well_known_protos = well_known_protos,
- generate_mock = generate_mock,
+ generate_mocks = generate_mocks,
**kwargs
)
diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl
index f88ee2f..e610123 100644
--- a/bazel/generate_cc.bzl
+++ b/bazel/generate_cc.bzl
@@ -14,7 +14,7 @@
if ctx.executable.plugin:
outs += [proto.path[label_len:-len(".proto")] + ".grpc.pb.h" for proto in protos]
outs += [proto.path[label_len:-len(".proto")] + ".grpc.pb.cc" for proto in protos]
- if ctx.attr.generate_mock:
+ if ctx.attr.generate_mocks:
outs += [proto.path[label_len:-len(".proto")] + "_mock.grpc.pb.h" for proto in protos]
else:
outs += [proto.path[label_len:-len(".proto")] + ".pb.h" for proto in protos]
@@ -26,7 +26,7 @@
if ctx.executable.plugin:
arguments += ["--plugin=protoc-gen-PLUGIN=" + ctx.executable.plugin.path]
flags = list(ctx.attr.flags)
- if ctx.attr.generate_mock:
+ if ctx.attr.generate_mocks:
flags.append("generate_mock_code=true")
arguments += ["--PLUGIN_out=" + ",".join(flags) + ":" + dir_out]
additional_input = [ctx.executable.plugin]
@@ -76,7 +76,7 @@
"well_known_protos" : attr.label(
mandatory = False,
),
- "generate_mock" : attr.bool(
+ "generate_mocks" : attr.bool(
default = False,
mandatory = False,
),
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 571b29c..08dc3de 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -97,7 +97,7 @@
load("//:bazel/cc_grpc_library.bzl", "cc_grpc_library")
def grpc_proto_library(name, srcs = [], deps = [], well_known_protos = False,
- has_services = True, use_external = False, generate_mock = False):
+ has_services = True, use_external = False, generate_mocks = False):
cc_grpc_library(
name = name,
srcs = srcs,
@@ -105,7 +105,7 @@
well_known_protos = well_known_protos,
proto_only = not has_services,
use_external = use_external,
- generate_mock = generate_mock,
+ generate_mocks = generate_mocks,
)
def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++"):
diff --git a/doc/unit_testing.md b/doc/unit_testing.md
index 0aa9be9..ca56481 100644
--- a/doc/unit_testing.md
+++ b/doc/unit_testing.md
@@ -56,7 +56,7 @@
1. Setting flag(generate_mock_code=true) on grpc plugin for protoc, or
-1. Setting an attribute(generate_mock) in your bazel rule.
+1. Setting an attribute(generate_mocks) in your bazel rule.
Protoc plugin flag:
@@ -70,7 +70,7 @@
grpc_proto_library(
name = "echo_proto",
srcs = ["echo.proto"],
- generate_mock = True,
+ generate_mocks = True,
)
```
diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD
index b8e9a22..58412ed 100644
--- a/src/proto/grpc/testing/BUILD
+++ b/src/proto/grpc/testing/BUILD
@@ -26,7 +26,7 @@
grpc_proto_library(
name = "compiler_test_proto",
srcs = ["compiler_test.proto"],
- generate_mock = True,
+ generate_mocks = True,
)
grpc_proto_library(
@@ -49,7 +49,7 @@
name = "echo_proto",
srcs = ["echo.proto"],
deps = ["echo_messages_proto"],
- generate_mock = True,
+ generate_mocks = True,
)
grpc_proto_library(
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index 722cf8a..1d99fbc 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -84,6 +84,9 @@
{
'v1.9.1': None
},
+ {
+ 'v1.10.0': None
+ },
],
'go': [
{
@@ -180,6 +183,9 @@
{
'v1.9.1': None
},
+ {
+ 'v1.10.0': None
+ },
],
'node': [
{
@@ -209,7 +215,10 @@
},
{
'v1.9.1': None
- }
+ },
+ {
+ 'v1.10.0': None
+ },
],
'ruby': [
{
@@ -244,6 +253,9 @@
{
'v1.9.1': None
},
+ {
+ 'v1.10.0': None
+ },
],
'php': [
{
@@ -273,6 +285,9 @@
{
'v1.9.1': None
},
+ {
+ 'v1.10.0': None
+ },
],
'csharp': [
#{'v1.0.1': None},
@@ -300,6 +315,9 @@
{
'v1.9.1': None
},
+ {
+ 'v1.10.0': None
+ },
],
}