Skip to content

Only respect the Starlark versions of --proto_toolchain_for*. This is… #26091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anandolee merged 1 commit into from
Feb 25, 2026
+10 −29
Merged

Only respect the Starlark versions of --proto_toolchain_for*. This is… #26091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bazel/flags/flags.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ _FLAGS = {
native = lambda ctx: getattr(ctx.fragments.proto, "cc_proto_library_source_suffixes"),
default = [".pb.cc"],
),
"proto_toolchain_for_java": struct(
native = lambda ctx: getattr(ctx.attr, "_aspect_java_proto_toolchain"),
default = "@bazel_tools//tools/proto:java_toolchain",
"_proto_toolchain_for_java": struct(
native = lambda ctx: "//:java_toolchain",
default = "//:java_toolchain",
),
"proto_toolchain_for_javalite": struct(
native = lambda ctx: getattr(ctx.attr, "_aspect_proto_toolchain_for_javalite"),
default = "@bazel_tools//tools/proto:javalite_toolchain",
"_proto_toolchain_for_javalite": struct(
native = lambda ctx: "//:javalite_toolchain",
default = "//:javalite_toolchain",
),
"proto_toolchain_for_cc": struct(
native = lambda ctx: getattr(ctx.attr, "_aspect_cc_proto_toolchain"),
default = "@bazel_tools//tools/proto:cc_toolchain",
"_proto_toolchain_for_cc": struct(
native = lambda ctx: "//:cc_toolchain",
default = "//:cc_toolchain",
),
}

Expand Down
6 changes: 0 additions & 6 deletions bazel/private/java_lite_proto_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ _java_lite_proto_aspect = aspect(
implementation = _aspect_impl,
attr_aspects = ["deps", "exports"],
attrs = toolchains.if_legacy_toolchain({
_PROTO_TOOLCHAIN_ATTR: attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_java_lite"),
),
"_proto_toolchain_for_javalite": attr.label(
default = Label("//bazel/flags/java:proto_toolchain_for_javalite"),
),
Expand Down Expand Up @@ -171,9 +168,6 @@ The list of <a href="protocol-buffer.html#proto_library"><code>proto_library</co
rules to generate Java code for.
"""),
} | toolchains.if_legacy_toolchain({
_PROTO_TOOLCHAIN_ATTR: attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_java_lite"),
),
"_proto_toolchain_for_javalite": attr.label(
default = Label("//bazel/flags/java:proto_toolchain_for_javalite"),
),
Expand Down
6 changes: 0 additions & 6 deletions bazel/private/java_proto_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ java_proto_aspect = aspect(
implementation = _java_proto_aspect_impl,
attrs = (
toolchains.if_legacy_toolchain({
"_aspect_java_proto_toolchain": attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_java"),
),
"_proto_toolchain_for_java": attr.label(
default = "//bazel/flags/java:proto_toolchain_for_java",
),
Expand Down Expand Up @@ -163,9 +160,6 @@ rules to generate Java code for.
# buildifier: disable=attr-license (calling attr.license())
"licenses": attr.license() if hasattr(attr, "license") else attr.string_list(),
} | toolchains.if_legacy_toolchain({
"_aspect_java_proto_toolchain": attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_java"),
),
"_proto_toolchain_for_java": attr.label(
default = "//bazel/flags/java:proto_toolchain_for_java",
),
Expand Down
6 changes: 0 additions & 6 deletions bazel/private/oss/cc_proto_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ cc_proto_aspect = aspect(
),
} |
toolchains.if_legacy_toolchain({
"_aspect_cc_proto_toolchain": attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_cc"),
),
"_proto_toolchain_for_cc": attr.label(
default = Label("//bazel/flags/cc:proto_toolchain_for_cc"),
),
Expand Down Expand Up @@ -196,9 +193,6 @@ The list of <a href="protocol-buffer.html#proto_library"><code>proto_library</co
rules to generate C++ code for.""",
),
} | toolchains.if_legacy_toolchain({
"_aspect_cc_proto_toolchain": attr.label(
default = configuration_field(fragment = "proto", name = "proto_toolchain_for_cc"),
),
"_proto_toolchain_for_cc": attr.label(
default = "//bazel/flags/cc:proto_toolchain_for_cc",
),
Expand Down
3 changes: 1 addition & 2 deletions bazel/private/proto_lang_toolchain_rule.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ Deprecated. Alias for <code>denylisted_protos</code>. Will be removed in a futur
"_proto_compiler": attr.label(
cfg = "exec",
executable = True,
allow_files = True,
default = configuration_field("proto", "proto_compiler"),
default = "//bazel/flags:proto_compiler",
),
}),
provides = [ProtoLangToolchainInfo],
Expand Down
Loading