From b1aec663f97e34806598711bba97b51d16c071b0 Mon Sep 17 00:00:00 2001 From: Yuta HIGUCHI Date: Wed, 15 Nov 2017 14:20:13 -0800 Subject: [PATCH] Fix gRPC buck util not to pickup random .proto files - should address issue reported in https://gerrit.onosproject.org/15958 Change-Id: Id02b950e3a732c89b1c9f71499a6a23b18ad7123 --- bucklets/grpc.bucklet | 2 +- protocols/p4runtime/proto/BUCK | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bucklets/grpc.bucklet b/bucklets/grpc.bucklet index a9e8926c7d..34b31f2d52 100644 --- a/bucklets/grpc.bucklet +++ b/bucklets/grpc.bucklet @@ -90,7 +90,7 @@ def grpc_jar( proto_paths = [], srcs = [], src_string = '', # Useful to build proto files external to the ONOS sources, using BUCK's environment variables. - proto_match_patterns = [ "**/proto/**/*.proto" ], + proto_match_patterns = [ "src/main/proto/**/*.proto" ], protoc_version = DEFAULT_PROTOC_VERSION, plugin_version = DEFAULT_GRPC_PLUGIN_VERSION, include_std_lib = False, diff --git a/protocols/p4runtime/proto/BUCK b/protocols/p4runtime/proto/BUCK index f8623f867d..fdb25150c1 100644 --- a/protocols/p4runtime/proto/BUCK +++ b/protocols/p4runtime/proto/BUCK @@ -52,4 +52,4 @@ grpc_jar( project_config( src_target = ':onos-protocols-p4runtime-proto' -) \ No newline at end of file +)