diff options
| author |  Yuxuan Li <yuxuanli@google.com> | 2017-05-15 14:15:34 -0700 |
|---|---|---|
| committer | Yuxuan Li <yuxuanli@google.com> | 2017-05-15 14:15:34 -0700 |
| commit | 6ca796d7ad26acc67bd5a0507682bbd74d393923 (patch) | |
| tree | 0f52bdd7168e690be56ee256c64a450a7b8d698e /src/proto | |
| parent | 864ac0d28d1617e69e3579b17f62d3619546471b (diff) | |
| parent | 746f21ade866d92efdab3e633fa63429bda20813 (diff) | |
merge master, resolve conflict
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/grpc/testing/BUILD | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD index 805988c337..5f1c005faf 100644 --- a/src/proto/grpc/testing/BUILD +++ b/src/proto/grpc/testing/BUILD @@ -42,8 +42,11 @@ grpc_proto_library( grpc_proto_library( name = "control_proto", srcs = ["control.proto"], - deps = ["payloads_proto", "stats_proto"], has_services = False, + deps = [ + "payloads_proto", + "stats_proto", + ], ) grpc_proto_library( @@ -101,5 +104,8 @@ grpc_proto_library( grpc_proto_library( name = "test_proto", srcs = ["test.proto"], - deps = ["empty_proto", "messages_proto"], + deps = [ + "empty_proto", + "messages_proto", + ], ) |