Remove host_javabase from java_common.compile call in tests.
The parameter is not needed as the value comes from java_toolchain.
@@ -299,7 +299,6 @@ def _impl(ctx):
resources = ctx.files.resources,
strict_deps = "ERROR",
java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],
- host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],
)
return struct(
files = depset([output_jar]),
@@ -314,7 +313,6 @@ java_custom_library = rule(
"exports": attr.label_list(),
"resources": attr.label_list(allow_files=True),
"_java_toolchain": attr.label(default = Label("${JAVA_TOOLCHAIN}")),
- "_host_javabase": attr.label(default = Label("@bazel_tools//tools/jdk:current_host_java_runtime"))
},
fragments = ["java"]
)
@@ -475,7 +473,6 @@ def _impl(ctx):
sourcepath = ctx.files.sourcepath,
strict_deps = "ERROR",
java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],
- host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],
)
return struct(
files = depset([output_jar]),
@@ -488,7 +485,6 @@ java_custom_library = rule(
"srcs": attr.label_list(allow_files=True),
"sourcepath": attr.label_list(),
"_java_toolchain": attr.label(default = Label("${JAVA_TOOLCHAIN}")),
- "_host_javabase": attr.label(default = Label("@bazel_tools//tools/jdk:current_host_java_runtime"))
},
fragments = ["java"]
)
@@ -547,7 +543,6 @@ def _impl(ctx):
sourcepath = ctx.files.sourcepath,
strict_deps = "ERROR",
java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],
- host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],
)
return struct(
files = depset([output_jar]),
@@ -560,7 +555,6 @@ java_custom_library = rule(
"srcs": attr.label_list(allow_files=True),
"sourcepath": attr.label_list(),
"_java_toolchain": attr.label(default = Label("${JAVA_TOOLCHAIN}")),
- "_host_javabase": attr.label(default = Label("@bazel_tools//tools/jdk:current_host_java_runtime"))
},
fragments = ["java"]
)
@@ -1448,7 +1442,6 @@ def _impl(ctx):
source_files = ctx.files.srcs,
output = compiled_jar,
java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],
- host_javabase = ctx.attr._host_javabase[java_common.JavaRuntimeInfo],
)
imported_provider = JavaInfo(output_jar = imported_jar, compile_jar = imported_jar);
@@ -1469,7 +1462,6 @@ java_custom_library = rule(
"srcs": attr.label_list(allow_files=True),
"jar": attr.label(allow_files=True),
"_java_toolchain": attr.label(default = Label("${JAVA_TOOLCHAIN}")),
- "_host_javabase": attr.label(default = Label("@bazel_tools//tools/jdk:current_host_java_runtime"))
},
fragments = ["java"]
)
