Skip to content

Commit cb03bd2

Browse files
committedJan 10, 2024
java_grpc_library.bzl: Support Auto Exec Groups
Tested with --incompatible_auto_exec_groups=true with Bazel 7
1 parent 6605649 commit cb03bd2

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed
 

‎java_grpc_library.bzl

+1-5
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ def _java_rpc_library_impl(ctx):
9494
args.add_joined("--descriptor_set_in", descriptor_set_in, join_with = ctx.configuration.host_path_separator)
9595
args.add_all(srcs, map_each = _path_ignoring_repository)
9696

97-
# TODO: Once Bazel 5.x support is dropped, add 'toolchain = None' inside the action.
9897
ctx.actions.run(
9998
inputs = depset([toolchain.plugin] + srcs, transitive = [descriptor_set_in]),
10099
outputs = [srcjar],
101100
executable = toolchain.protoc,
102101
arguments = [args],
103102
use_default_shell_env = True,
103+
toolchain = None,
104104
)
105105

106106
deps_java_info = java_common.merge([dep[JavaInfo] for dep in ctx.attr.deps])
@@ -134,8 +134,6 @@ _java_grpc_library = rule(
134134
"_toolchain": attr.label(
135135
default = Label("//compiler:java_grpc_library_toolchain"),
136136
),
137-
# TODO: Enable AEGs when Bazel 5.x support is dropped.
138-
"_use_auto_exec_groups": attr.bool(default = False),
139137
},
140138
toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
141139
fragments = ["java"],
@@ -163,8 +161,6 @@ _java_lite_grpc_library = rule(
163161
"_toolchain": attr.label(
164162
default = Label("//compiler:java_lite_grpc_library_toolchain"),
165163
),
166-
# TODO: Enable AEGs when Bazel 5.x support is dropped.
167-
"_use_auto_exec_groups": attr.bool(default = False),
168164
},
169165
toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
170166
fragments = ["java"],

0 commit comments

Comments
 (0)
Please sign in to comment.