Skip to content

Commit 303d428

Browse files
committed
Use third_party provided gogo proto file
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent ef35097 commit 303d428

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

bazel/gogo.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def _gogo_grpc_proto_impl(ctx):
2323
ctx.file("WORKSPACE", 'workspace(name = "{}")'.format(ctx.name))
2424
ctx.file("BUILD.bazel", "")
2525
ctx.symlink(
26-
ctx.path(Label("@com_github_gogo_protobuf//gogoproto:gogo.proto")),
26+
ctx.path(Label("//third_party/gogoproto:gogo.proto")),
2727
"gogoproto/gogo.proto",
2828
)
2929
ctx.file("gogoproto/BUILD.bazel", """

third_party/gogoproto/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# Copyright 2018- The Pixie Authors.
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,8 @@
1415
#
1516
# SPDX-License-Identifier: Apache-2.0
1617

18+
=======
19+
>>>>>>> 5c7876bef (Use third_party provided gogo proto file)
1720
# Create filegroup with a name bazel
1821
filegoup = filegroup(
1922
name = "bazel",

0 commit comments

Comments
 (0)