Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parameters of java_common.compile. #7598

Merged
merged 3 commits into from Oct 8, 2021
Merged

Fix parameters of java_common.compile. #7598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae1162f
Fix parameters of java_common.compile.
comius Nov 6, 2020
fc0fc7e
Removed other references to host_javabase.
comius Oct 8, 2021
293f29c
Bump Bazel to 4.0.0 as otherwise host_javabase is required
ejona86 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildscripts/kokoro/bazel.sh
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
set -exu -o pipefail
cat /VERSION

use_bazel.sh 1.0.1
use_bazel.sh 4.0.0
bazel version

cd github/grpc-java
Expand Down
7 changes: 0 additions & 7 deletions java_grpc_library.bzl
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@

_JavaRpcToolchainInfo = provider(
fields = [
"host_javabase",
"java_toolchain",
"plugin",
"plugin_arg",
Expand All @@ -14,7 +13,6 @@ _JavaRpcToolchainInfo = provider(
def _java_rpc_toolchain_impl(ctx):
return [
_JavaRpcToolchainInfo(
host_javabase = ctx.attr._host_javabase,
java_toolchain = ctx.attr._java_toolchain,
plugin = ctx.executable.plugin,
plugin_arg = ctx.attr.plugin_arg,
Expand Down Expand Up @@ -44,10 +42,6 @@ java_rpc_toolchain = rule(
"_java_toolchain": attr.label(
default = Label("@bazel_tools//tools/jdk:current_java_toolchain"),
),
"_host_javabase": attr.label(
cfg = "host",
default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
),
},
provides = [
_JavaRpcToolchainInfo,
Expand Down Expand Up @@ -106,7 +100,6 @@ def _java_rpc_library_impl(ctx):
java_info = java_common.compile(
ctx,
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