Merge remote-tracking branch 'origin/main' into fz/cc_nop

Signed-off-by: Martin Conte Mac Donell <reflejo@gmail.com>
bufbuild · Jan 28, 2022 · e75933d · e75933d
2 parents c5d3880 + 24a0cf3
commit e75933d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl
@@ -198,7 +198,6 @@ def _java_proto_gen_validate_impl(ctx):
         output_source_jar = ctx.outputs.srcjar,
         output = ctx.outputs.jar,
         java_toolchain = find_java_toolchain(ctx, ctx.attr._java_toolchain),
-        host_javabase = find_java_runtime_toolchain(ctx, ctx.attr._host_javabase),
     )
 
     return [java_info]
@@ -231,10 +230,6 @@ java_proto_gen_validate = 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_host_java_runtime"),
-        ),
     },
     fragments = ["java"],
     provides = [JavaInfo],