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 alternative javac toolchains 

Depending on jdk:toolchain causes java_grpc_library to always use the
_default_ toolchain, even if the user tried to override it. Changing to
:current_java_toolchain allows the rule to use the user-selected
toolchain when overridden.

Tested by adding to BUILD:
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
default_java_toolchain(
    name = "mychain",
    misc = ["-Amy=flag"],
    visibility = ["//visibility:public"],
)

And then verifying -Amy=flag is in the output of:
bazel aquery --java_toolchain=:mychain services:_reflection_java_grpc

Fixes #5841
This commit is contained in:
Eric Anderson 2019-06-06 13:54:32 -07:00
parent 63a6e26f39
commit 5d0c283b46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_grpc_library.bzl
View File

@ -44,7 +44,7 @@ java_rpc_toolchain = rule(
executable = True, executable = True,
), ),
"_java_toolchain": attr.label( "_java_toolchain": attr.label(
default = Label("@bazel_tools//tools/jdk:toolchain"), default = Label("@bazel_tools//tools/jdk:current_java_toolchain"),
), ),
"_host_javabase": attr.label( "_host_javabase": attr.label(
cfg = "host", cfg = "host",