Skip to content

Commit aa181e2

Browse files
protobuf-github-botcomius
authored andcommitted
Convert proto toolchain string to Label
Without it the still slightly weird setup of Bazel unit tests causes problems. PiperOrigin-RevId: 684391633
1 parent 1822c8a commit aa181e2

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

bazel/private/bazel_cc_proto_library.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ load("//bazel/common:proto_info.bzl", "ProtoInfo")
1313
load("//bazel/private:cc_proto_support.bzl", "cc_proto_compile_and_link")
1414
load("//bazel/private:toolchain_helpers.bzl", "toolchains")
1515

16-
_CC_PROTO_TOOLCHAIN = "//bazel/private:cc_toolchain_type"
16+
_CC_PROTO_TOOLCHAIN = Label("//bazel/private:cc_toolchain_type")
1717

1818
_ProtoCcFilesInfo = provider(fields = ["files"], doc = "Provide cc proto files.")
1919
_ProtoCcHeaderInfo = provider(fields = ["headers"], doc = "Provide cc proto headers.")

bazel/private/bazel_java_proto_library_rule.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load("//bazel/common:proto_info.bzl", "ProtoInfo")
1212
load("//bazel/private:java_proto_support.bzl", "JavaProtoAspectInfo", "java_compile_for_protos", "java_info_merge_for_protos")
1313
load("//bazel/private:toolchain_helpers.bzl", "toolchains")
1414

15-
_JAVA_PROTO_TOOLCHAIN = "//bazel/private:java_toolchain_type"
15+
_JAVA_PROTO_TOOLCHAIN = Label("//bazel/private:java_toolchain_type")
1616

1717
def _filter_provider(provider, *attrs):
1818
return [dep[provider] for attr in attrs for dep in attr if provider in dep]

bazel/private/java_lite_proto_library.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ load("//bazel/private:toolchain_helpers.bzl", "toolchains")
1616

1717
_PROTO_TOOLCHAIN_ATTR = "_aspect_proto_toolchain_for_javalite"
1818

19-
_JAVA_LITE_PROTO_TOOLCHAIN = "//bazel/private:javalite_toolchain_type"
19+
_JAVA_LITE_PROTO_TOOLCHAIN = Label("//bazel/private:javalite_toolchain_type")
2020

2121
def _aspect_impl(target, ctx):
2222
"""Generates and compiles Java code for a proto_library dependency graph.

bazel/private/toolchain_helpers.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ toolchains = struct(
4545
find_toolchain = _find_toolchain,
4646
if_legacy_toolchain = _if_legacy_toolchain,
4747
INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = _incompatible_toolchain_resolution,
48-
PROTO_TOOLCHAIN = "//bazel/private:proto_toolchain_type",
48+
PROTO_TOOLCHAIN = Label("//bazel/private:proto_toolchain_type"),
4949
)

0 commit comments

Comments
 (0)