grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

java_grpc_library.bzl: Support Auto Exec Groups 

Tested with --incompatible_auto_exec_groups=true with Bazel 7
This commit is contained in:
Eric Anderson 2024-01-10 07:10:29 -08:00
parent 6605649c28
commit cb03bd2346
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java_grpc_library.bzl
View File

@ -94,13 +94,13 @@ def _java_rpc_library_impl(ctx):
args.add_joined("--descriptor_set_in", descriptor_set_in, join_with = ctx.configuration.host_path_separator)
args.add_all(srcs, map_each = _path_ignoring_repository)
# TODO: Once Bazel 5.x support is dropped, add 'toolchain = None' inside the action.
ctx.actions.run(
inputs = depset([toolchain.plugin] + srcs, transitive = [descriptor_set_in]),
outputs = [srcjar],
executable = toolchain.protoc,
arguments = [args],
use_default_shell_env = True,
toolchain = None,
)
deps_java_info = java_common.merge([dep[JavaInfo] for dep in ctx.attr.deps])
@ -134,8 +134,6 @@ _java_grpc_library = rule(
"_toolchain": attr.label(
default = Label("//compiler:java_grpc_library_toolchain"),
),
# TODO: Enable AEGs when Bazel 5.x support is dropped.
"_use_auto_exec_groups": attr.bool(default = False),
},
toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
fragments = ["java"],
@ -163,8 +161,6 @@ _java_lite_grpc_library = rule(
"_toolchain": attr.label(
default = Label("//compiler:java_lite_grpc_library_toolchain"),
),
# TODO: Enable AEGs when Bazel 5.x support is dropped.
"_use_auto_exec_groups": attr.bool(default = False),
},
toolchains = ["@bazel_tools//tools/jdk:toolchain_type"],
fragments = ["java"],