Run buildifier
diff --git a/toolchains/BUILD b/toolchains/BUILD index 06f0448..e5f76a8 100644 --- a/toolchains/BUILD +++ b/toolchains/BUILD
@@ -1,9 +1,11 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") +load("@rules_java//java:defs.bzl", "java_import") +load("@rules_python//python:defs.bzl", "py_binary", "py_test") load( "//toolchains:default_java_toolchain.bzl", "DEFAULT_TOOLCHAIN_CONFIGURATION", "JVM8_TOOLCHAIN_CONFIGURATION", "PREBUILT_TOOLCHAIN_CONFIGURATION", - "VANILLA_TOOLCHAIN_CONFIGURATION", "bootclasspath", "default_java_toolchain", "java_runtime_files", @@ -15,7 +17,6 @@ "java_runtime_version_alias", "java_toolchain_alias", ) -load("@rules_python//python:defs.bzl", "py_binary", "py_test") package(default_visibility = ["//visibility:public"]) @@ -100,27 +101,27 @@ cc_library( name = "jni", hdrs = [":jni_header"] + select({ - "@bazel_tools//src/conditions:linux_aarch64": [":jni_md_header-linux"], - "@bazel_tools//src/conditions:linux_ppc64le": [":jni_md_header-linux"], - "@bazel_tools//src/conditions:linux_s390x": [":jni_md_header-linux"], - "@bazel_tools//src/conditions:linux_mips64": [":jni_md_header-linux"], - "@bazel_tools//src/conditions:linux_riscv64": [":jni_md_header-linux"], - "@bazel_tools//src/conditions:linux_x86_64": [":jni_md_header-linux"], "@bazel_tools//src/conditions:darwin": [":jni_md_header-darwin"], "@bazel_tools//src/conditions:freebsd": [":jni_md_header-freebsd"], + "@bazel_tools//src/conditions:linux_aarch64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_mips64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_ppc64le": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_riscv64": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_s390x": [":jni_md_header-linux"], + "@bazel_tools//src/conditions:linux_x86_64": [":jni_md_header-linux"], "@bazel_tools//src/conditions:openbsd": [":jni_md_header-openbsd"], "@bazel_tools//src/conditions:windows": [":jni_md_header-windows"], "//conditions:default": [], }), includes = ["include"] + select({ - "@bazel_tools//src/conditions:linux_aarch64": ["include/linux"], - "@bazel_tools//src/conditions:linux_ppc64le": ["include/linux"], - "@bazel_tools//src/conditions:linux_s390x": ["include/linux"], - "@bazel_tools//src/conditions:linux_mips64": [":include/linux"], - "@bazel_tools//src/conditions:linux_riscv64": [":include/linux"], - "@bazel_tools//src/conditions:linux_x86_64": ["include/linux"], "@bazel_tools//src/conditions:darwin": ["include/darwin"], "@bazel_tools//src/conditions:freebsd": ["include/freebsd"], + "@bazel_tools//src/conditions:linux_aarch64": ["include/linux"], + "@bazel_tools//src/conditions:linux_mips64": [":include/linux"], + "@bazel_tools//src/conditions:linux_ppc64le": ["include/linux"], + "@bazel_tools//src/conditions:linux_riscv64": [":include/linux"], + "@bazel_tools//src/conditions:linux_s390x": ["include/linux"], + "@bazel_tools//src/conditions:linux_x86_64": ["include/linux"], "@bazel_tools//src/conditions:openbsd": ["include/openbsd"], "@bazel_tools//src/conditions:windows": ["include/win32"], "//conditions:default": [], @@ -178,8 +179,8 @@ alias( name = "ijar_prebuilt_binary_or_cc_binary", actual = select({ - "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", "@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", + "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", "@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows", "//conditions:default": "@remote_java_tools//:ijar_cc_binary", }), @@ -188,8 +189,8 @@ alias( name = "ijar_prebuilt_binary", actual = select({ - "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", "@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin", + "@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux", "@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows", }), ) @@ -208,8 +209,8 @@ alias( name = "singlejar_prebuilt_or_cc_binary", actual = select({ - "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", "@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin", + "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", "@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows", "//conditions:default": "@remote_java_tools//:singlejar_cc_bin", }), @@ -218,8 +219,8 @@ alias( name = "prebuilt_singlejar", actual = select({ - "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", "@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin", + "@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux", "@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows", }), ) @@ -311,14 +312,6 @@ actual = "@remote_java_tools//:proguard", ) -BOOTCLASS_JARS = [ - "rt.jar", - "resources.jar", - "jsse.jar", - "jce.jar", - "charsets.jar", -] - # TODO(cushon): this isn't compatible with JDK 9 alias( name = "bootclasspath",
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index 1e83e3c..49652c3 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -1,4 +1,4 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. +# Copyright 2021 The Bazel Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Bazel rules for creating Java toolchains.""" +"""Rules for defining default_java_toolchain""" + +load("@rules_java//java:defs.bzl", "java_toolchain") JDK8_JVM_OPTS = [ "-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)", @@ -162,12 +164,19 @@ ) def default_java_toolchain(name, configuration = DEFAULT_TOOLCHAIN_CONFIGURATION, toolchain_definition = True, **kwargs): - """Defines a remote java_toolchain with appropriate defaults for Bazel.""" + """Defines a remote java_toolchain with appropriate defaults for Bazel. + + Args: + name: The name of the toolchain + configuration: Toolchain configuration + toolchain_definition: Whether to define toolchain target and its config setting + **kwargs: More arguments for the java_toolchain target + """ toolchain_args = dict(_BASE_TOOLCHAIN_CONFIGURATION) toolchain_args.update(configuration) toolchain_args.update(kwargs) - native.java_toolchain( + java_toolchain( name = name, **toolchain_args ) @@ -274,6 +283,7 @@ cfg = "host", providers = [java_common.JavaRuntimeInfo], ), + "output_jar": attr.output(mandatory = True), "src": attr.label( cfg = "host", allow_single_file = True, @@ -281,7 +291,6 @@ "target_javabase": attr.label( providers = [java_common.JavaRuntimeInfo], ), - "output_jar": attr.output(mandatory = True), }, )
diff --git a/toolchains/java_toolchain_alias.bzl b/toolchains/java_toolchain_alias.bzl index 27bf4e4..1dc15ee 100644 --- a/toolchains/java_toolchain_alias.bzl +++ b/toolchains/java_toolchain_alias.bzl
@@ -96,6 +96,8 @@ """An experimental implementation of java_toolchain_alias using toolchain resolution.""" toolchain_info = ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"] toolchain = toolchain_info.java + + # buildifier: disable=rule-impl-return return struct( providers = [ toolchain_info,