From ae1162f779334ebfef2c740adb590f324ebc0ad1 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Fri, 6 Nov 2020 17:53:16 +0100
Subject: [PATCH 1/3] Fix parameters of java_common.compile.

Parameter host_javabase is removed

This is preparation for flipping incompatible_java_common_parameters.
See https://github.com/bazelbuild/bazel/issues/12373
---
 java_grpc_library.bzl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index cd385998d27..59b0ffc47f9 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -106,7 +106,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,

From fc0fc7edfa8bff7adb87d5a4f8f3b380a1939c2b Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Fri, 8 Oct 2021 19:00:06 +0000
Subject: [PATCH 2/3] Removed other references to host_javabase.

---
 java_grpc_library.bzl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index 59b0ffc47f9..913e905a711 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -2,7 +2,6 @@
 
 _JavaRpcToolchainInfo = provider(
     fields = [
-        "host_javabase",
         "java_toolchain",
         "plugin",
         "plugin_arg",
@@ -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,
@@ -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,

From 293f29cb321489734c80f5f67a3fdb7628b326a7 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Fri, 8 Oct 2021 12:51:52 -0700
Subject: [PATCH 3/3] Bump Bazel to 4.0.0 as otherwise host_javabase is
 required

---
 buildscripts/kokoro/bazel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildscripts/kokoro/bazel.sh b/buildscripts/kokoro/bazel.sh
index f63c05f300b..107a305bbf9 100755
--- a/buildscripts/kokoro/bazel.sh
+++ b/buildscripts/kokoro/bazel.sh
@@ -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