@@ -94,13 +94,13 @@ def _java_rpc_library_impl(ctx):
94
94
args .add_joined ("--descriptor_set_in" , descriptor_set_in , join_with = ctx .configuration .host_path_separator )
95
95
args .add_all (srcs , map_each = _path_ignoring_repository )
96
96
97
- # TODO: Once Bazel 5.x support is dropped, add 'toolchain = None' inside the action.
98
97
ctx .actions .run (
99
98
inputs = depset ([toolchain .plugin ] + srcs , transitive = [descriptor_set_in ]),
100
99
outputs = [srcjar ],
101
100
executable = toolchain .protoc ,
102
101
arguments = [args ],
103
102
use_default_shell_env = True ,
103
+ toolchain = None ,
104
104
)
105
105
106
106
deps_java_info = java_common .merge ([dep [JavaInfo ] for dep in ctx .attr .deps ])
@@ -134,8 +134,6 @@ _java_grpc_library = rule(
134
134
"_toolchain" : attr .label (
135
135
default = Label ("//compiler:java_grpc_library_toolchain" ),
136
136
),
137
- # TODO: Enable AEGs when Bazel 5.x support is dropped.
138
- "_use_auto_exec_groups" : attr .bool (default = False ),
139
137
},
140
138
toolchains = ["@bazel_tools//tools/jdk:toolchain_type" ],
141
139
fragments = ["java" ],
@@ -163,8 +161,6 @@ _java_lite_grpc_library = rule(
163
161
"_toolchain" : attr .label (
164
162
default = Label ("//compiler:java_lite_grpc_library_toolchain" ),
165
163
),
166
- # TODO: Enable AEGs when Bazel 5.x support is dropped.
167
- "_use_auto_exec_groups" : attr .bool (default = False ),
168
164
},
169
165
toolchains = ["@bazel_tools//tools/jdk:toolchain_type" ],
170
166
fragments = ["java" ],
0 commit comments