flasn4nt
/
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: Inline find_java_toolchain and find_java_runtime_toolchain 

These methods were used to migrate the Java toolchains to use toolchain
resolution. Now that the migration is complete, the toolchain providers
can be used directly.
This commit is contained in:
Liam Miller-Cushon 2020-01-30 10:44:23 -08:00 committed by Eric Anderson
parent 2acca6ea3b
commit 084f5bc4bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java_grpc_library.bzl
View File

@ -1,7 +1,5 @@
"""Build rule for java_grpc_library.""" """Build rule for java_grpc_library."""
load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_runtime_toolchain", "find_java_toolchain")
_JavaRpcToolchainInfo = provider( _JavaRpcToolchainInfo = provider(
fields = [ fields = [
"host_javabase", "host_javabase",
@ -107,8 +105,8 @@ def _java_rpc_library_impl(ctx):
java_info = java_common.compile( java_info = java_common.compile(
ctx, ctx,
java_toolchain = find_java_toolchain(ctx, toolchain.java_toolchain), java_toolchain = toolchain.java_toolchain[java_common.JavaToolchainInfo],
host_javabase = find_java_runtime_toolchain(ctx, toolchain.host_javabase), host_javabase = toolchain.host_javabase[java_common.JavaRuntimeInfo],
source_jars = [srcjar], source_jars = [srcjar],
output = ctx.outputs.jar, output = ctx.outputs.jar,
output_source_jar = ctx.outputs.srcjar, output_source_jar = ctx.outputs.srcjar,