Skip to content

Commit

Permalink
java_grpc_library: Inline find_java_toolchain and find_java_runtime_t…
Browse files Browse the repository at this point in the history
…oolchain

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.
  • Loading branch information
cushon authored and ejona86 committed Jan 30, 2020
1 parent 2acca6e commit 084f5bc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions java_grpc_library.bzl
@@ -1,7 +1,5 @@
"""Build rule for java_grpc_library."""

load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_runtime_toolchain", "find_java_toolchain")

_JavaRpcToolchainInfo = provider(
fields = [
"host_javabase",
Expand Down Expand Up @@ -107,8 +105,8 @@ def _java_rpc_library_impl(ctx):

java_info = java_common.compile(
ctx,
java_toolchain = find_java_toolchain(ctx, toolchain.java_toolchain),
host_javabase = find_java_runtime_toolchain(ctx, toolchain.host_javabase),
java_toolchain = toolchain.java_toolchain[java_common.JavaToolchainInfo],
host_javabase = toolchain.host_javabase[java_common.JavaRuntimeInfo],
source_jars = [srcjar],
output = ctx.outputs.jar,
output_source_jar = ctx.outputs.srcjar,
Expand Down

0 comments on commit 084f5bc

Please sign in to comment.