We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent ef35097 commit 303d428Copy full SHA for 303d428
2 files changed
bazel/gogo.bzl
@@ -23,7 +23,7 @@ def _gogo_grpc_proto_impl(ctx):
23
ctx.file("WORKSPACE", 'workspace(name = "{}")'.format(ctx.name))
24
ctx.file("BUILD.bazel", "")
25
ctx.symlink(
26
- ctx.path(Label("@com_github_gogo_protobuf//gogoproto:gogo.proto")),
+ ctx.path(Label("//third_party/gogoproto:gogo.proto")),
27
"gogoproto/gogo.proto",
28
)
29
ctx.file("gogoproto/BUILD.bazel", """
third_party/gogoproto/BUILD.bazel
@@ -1,3 +1,4 @@
1
+<<<<<<< HEAD
2
# Copyright 2018- The Pixie Authors.
3
#
4
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,8 @@
14
15
16
# SPDX-License-Identifier: Apache-2.0
17
18
+=======
19
+>>>>>>> 5c7876bef (Use third_party provided gogo proto file)
20
# Create filegroup with a name bazel
21
filegoup = filegroup(
22
name = "bazel",
0 commit comments