From a714f05c9100d1254794cdca2097b539523191f6 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 18 Sep 2024 17:28:14 +0200 Subject: [PATCH] sat: rework go_proto_library() to be in sync with google3 --- ortools/sat/BUILD.bazel | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ortools/sat/BUILD.bazel b/ortools/sat/BUILD.bazel index 004f357360..6a8d73d039 100644 --- a/ortools/sat/BUILD.bazel +++ b/ortools/sat/BUILD.bazel @@ -62,12 +62,6 @@ cc_proto_library( deps = [":sat_parameters_proto"], ) -go_proto_library( - name = "sat_parameters_go_proto", - proto = ":sat_parameters_proto", - importpath = "github.com/google/or-tools/ortools/sat/proto/satparameters" -) - py_proto_library( name = "sat_parameters_py_pb2", deps = [":sat_parameters_proto"], @@ -78,6 +72,12 @@ java_proto_library( deps = [":sat_parameters_proto"], ) +go_proto_library( + name = "sat_parameters_go_proto", + proto = ":sat_parameters_proto", + importpath = "github.com/google/or-tools/ortools/sat/proto/satparameters", +) + proto_library( name = "cp_model_proto", srcs = ["cp_model.proto"], @@ -88,12 +88,6 @@ cc_proto_library( deps = [":cp_model_proto"], ) -go_proto_library( - name = "cp_model_go_proto", - importpath = "github.com/google/or-tools/ortools/sat/proto/cpmodel", - proto = ":cp_model_proto", -) - py_proto_library( name = "cp_model_py_pb2", deps = [":cp_model_proto"], @@ -104,6 +98,12 @@ java_proto_library( deps = [":cp_model_proto"], ) +go_proto_library( + name = "cp_model_go_proto", + proto = ":cp_model_proto", + importpath = "github.com/google/or-tools/ortools/sat/proto/cpmodel", +) + cc_library( name = "cp_model_utils", srcs = ["cp_model_utils.cc"],