From 084f5bc4bdd8e645c3528a195eef85d162b55097 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 30 Jan 2020 10:44:23 -0800 Subject: [PATCH] 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. --- java_grpc_library.bzl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl index 3e93ad71e0f..cd385998d27 100644 --- a/java_grpc_library.bzl +++ b/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", @@ -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,