Fix targets names in java_tools java_toolchain. Closes #8189. PiperOrigin-RevId: 245760454
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 742f84d..7d4ee45 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools
@@ -4,56 +4,61 @@ java_toolchain( name = "toolchain", - source_version = "8", - target_version = "8", + bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], + compatible_javacopts = { + # Restrict protos to Java 7 so that they are compatible with Android. + "proto": [ + "-source", + "7", + "-target", + "7", + ], + }, forcibly_disable_header_compilation = 0, genclass = [":Genclass"], - header_compiler = [":turbine"], - header_compiler_direct = [":turbine_direct"], + header_compiler = [":Turbine"], + header_compiler_direct = [":TurbineDirect"], ijar = [":ijar"], - javabuilder = [":javabuilder"], + javabuilder = [":JavaBuilder"], javac = [":javac_jar"], + javac_supports_workers = 1, + jvm_opts = [ + # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using + # G1 collector and having compact strings enabled. + "-XX:+UseParallelOldGC", + "-XX:-CompactStrings", + # Allow JavaBuilder to access internal javac APIs. + "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + + # override the javac in the JDK. + "--patch-module=java.compiler=$(location :java_compiler_jar)", + "--patch-module=jdk.compiler=$(location :jdk_compiler_jar)", + + # quiet warnings from com.google.protobuf.UnsafeUtil, + # see: https://github.com/google/protobuf/issues/3781 + # and: https://github.com/bazelbuild/bazel/issues/5599 + "--add-opens=java.base/java.nio=ALL-UNNAMED", + "--add-opens=java.base/java.lang=ALL-UNNAMED", + ], + misc = [ + "-XDskipDuplicateBridges=true", + "-g", + "-parameters", + ], + singlejar = [":singlejar"], + source_version = "8", + target_version = "8", tools = [ ":java_compiler_jar", ":jdk_compiler_jar", ], - javac_supports_workers = 1, - jvm_opts = [ - # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using - # G1 collector and having compact strings enabled. - "-XX:+UseParallelOldGC", - "-XX:-CompactStrings", - # Allow JavaBuilder to access internal javac APIs. - "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", - "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", - - # override the javac in the JDK. - "--patch-module=java.compiler=$(location :java_compiler_jar)", - "--patch-module=jdk.compiler=$(location :jdk_compiler_jar)", - - # quiet warnings from com.google.protobuf.UnsafeUtil, - # see: https://github.com/google/protobuf/issues/3781 - # and: https://github.com/bazelbuild/bazel/issues/5599 - "--add-opens=java.base/java.nio=ALL-UNNAMED", - "--add-opens=java.base/java.lang=ALL-UNNAMED", - ], - misc = [ - "-XDskipDuplicateBridges=true", - "-g", - "-parameters", - ], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": ["-source", "7", "-target", "7"], - }, - singlejar = [":singlejar"], - bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], ) filegroup( @@ -148,8 +153,8 @@ jars = ["java_tools/third_party/java/jacoco/org.jacoco.report-0.7.5.201505241946.jar"], srcjar = "java_tools/third_party/java/jacoco/org.jacoco.report-0.7.5.201505241946-src.jar", exports = [ - ":jacoco-core", ":asm", + ":jacoco-core", ], ) @@ -218,47 +223,47 @@ alias( name = "singlejar", actual = select({ - "//:remote": ":singlejar_cc_bin", - "//conditions:default": ":singlejar_prebuilt_or_cc_binary", - }), + "//:remote": ":singlejar_cc_bin", + "//conditions:default": ":singlejar_prebuilt_or_cc_binary", + }), ) alias( name = "singlejar_prebuilt_or_cc_binary", actual = select({ - ":linux_x86_64": "java_tools/src/tools/singlejar/singlejar_local", - ":darwin": "java_tools/src/tools/singlejar/singlejar_local", - ":darwin_x86_64": "java_tools/src/tools/singlejar/singlejar_local", - ":windows": "java_tools/src/tools/singlejar/singlejar_local.exe", - "//conditions:default": "singlejar_cc_bin", - }) + ":linux_x86_64": "java_tools/src/tools/singlejar/singlejar_local", + ":darwin": "java_tools/src/tools/singlejar/singlejar_local", + ":darwin_x86_64": "java_tools/src/tools/singlejar/singlejar_local", + ":windows": "java_tools/src/tools/singlejar/singlejar_local.exe", + "//conditions:default": "singlejar_cc_bin", + }), ) alias( - name = "ijar", - actual = select({ - ":remote": ":ijar_cc_binary", - "//conditions:default": ":prebuilt_binary_or_cc_binary", - }) + name = "ijar", + actual = select({ + ":remote": ":ijar_cc_binary", + "//conditions:default": ":prebuilt_binary_or_cc_binary", + }), ) alias( - name = "prebuilt_binary_or_cc_binary", - actual = select({ - ":linux_x86_64": ":ijar_prebuilt_binary", - ":darwin": ":ijar_prebuilt_binary", - ":darwin_x86_64": ":ijar_prebuilt_binary", - ":windows": ":ijar_prebuilt_binary", - "//conditions:default": ":ijar_cc_binary", - }) + name = "prebuilt_binary_or_cc_binary", + actual = select({ + ":linux_x86_64": ":ijar_prebuilt_binary", + ":darwin": ":ijar_prebuilt_binary", + ":darwin_x86_64": ":ijar_prebuilt_binary", + ":windows": ":ijar_prebuilt_binary", + "//conditions:default": ":ijar_cc_binary", + }), ) filegroup( name = "ijar_prebuilt_binary", srcs = select({ - ":windows": ["java_tools/ijar/ijar.exe"], - "//conditions:default": ["java_tools/ijar/ijar"], - }), + ":windows": ["java_tools/ijar/ijar.exe"], + "//conditions:default": ["java_tools/ijar/ijar"], + }), ) cc_binary( @@ -287,6 +292,8 @@ "java_tools/ijar/mapped_file.h", "java_tools/ijar/zip.h", ], + include_prefix = "third_party", + strip_include_prefix = "java_tools", deps = [ ":platform_utils", ":zlib_client", @@ -300,8 +307,6 @@ "//conditions:default": [ ], }), - strip_include_prefix = "java_tools", - include_prefix = "third_party", ) cc_library( @@ -311,14 +316,14 @@ "java_tools/ijar/common.h", "java_tools/ijar/platform_utils.h", ], + include_prefix = "third_party", + strip_include_prefix = "java_tools", visibility = ["//visibility:private"], deps = [ ":errors", ":filesystem", ":logging", ], - strip_include_prefix = "java_tools", - include_prefix = "third_party", ) cc_library( @@ -333,6 +338,7 @@ "java_tools/src/main/cpp/util/path_platform.h", "java_tools/src/main/cpp/util/port.h", ], + strip_include_prefix = "java_tools", visibility = ["//visibility:public"], deps = [ ":blaze_exit_code", @@ -343,7 +349,6 @@ ":port", ":strings", ], - strip_include_prefix = "java_tools", ) cc_library( @@ -357,8 +362,8 @@ name = "numbers", srcs = ["java_tools/src/main/cpp/util/numbers.cc"], hdrs = ["java_tools/src/main/cpp/util/numbers.h"], - deps = [":strings"], strip_include_prefix = "java_tools", + deps = [":strings"], ) cc_library( @@ -382,6 +387,7 @@ "java_tools/src/main/cpp/util/path.h", "java_tools/src/main/cpp/util/path_platform.h", ], + strip_include_prefix = "java_tools", deps = [ ":blaze_exit_code", ":errors", @@ -391,15 +397,14 @@ ":windows": [":lib-file"], "//conditions:default": [], }), - strip_include_prefix = "java_tools", ) cc_library( name = "lib-file", srcs = ["java_tools/src/main/native/windows/file.cc"], hdrs = ["java_tools/src/main/native/windows/file.h"], - deps = [":lib-util"], strip_include_prefix = "java_tools", + deps = [":lib-util"], ) cc_library( @@ -416,12 +421,12 @@ "//conditions:default": ["java_tools/src/main/cpp/util/errors_posix.cc"], }), hdrs = ["java_tools/src/main/cpp/util/errors.h"], + strip_include_prefix = "java_tools", deps = [ ":logging", ":port", ":strings", ], - strip_include_prefix = "java_tools", ) cc_library( @@ -432,8 +437,8 @@ defines = [ "BLAZE_OPENSOURCE", ], - deps = [":blaze_exit_code"], strip_include_prefix = "java_tools", + deps = [":blaze_exit_code"], ) cc_library( @@ -442,7 +447,6 @@ strip_include_prefix = "java_tools", ) - cc_library( name = "port", srcs = ["java_tools/src/main/cpp/util/port.cc"], @@ -454,11 +458,11 @@ name = "logging", srcs = ["java_tools/src/main/cpp/util/logging.cc"], hdrs = ["java_tools/src/main/cpp/util/logging.h"], + strip_include_prefix = "java_tools", deps = [ ":blaze_exit_code", ":strings", ], - strip_include_prefix = "java_tools", ) cc_library( @@ -468,9 +472,9 @@ "java_tools/ijar/common.h", "java_tools/ijar/zlib_client.h", ], - deps = ["//java_tools/zlib"], - strip_include_prefix = "java_tools", include_prefix = "third_party", + strip_include_prefix = "java_tools", + deps = ["//java_tools/zlib"], ) ##################### singlejar @@ -530,8 +534,8 @@ ) proto_library( - name = "desugar_deps_proto", - srcs = ["java_tools/src/main/protobuf/desugar_deps.proto"] + name = "desugar_deps_proto", + srcs = ["java_tools/src/main/protobuf/desugar_deps.proto"], ) cc_proto_library( @@ -568,16 +572,16 @@ name = "mapped_file", srcs = ["java_tools/src/tools/singlejar/mapped_file.cc"], hdrs = ["java_tools/src/tools/singlejar/mapped_file.h"] + - select({ - ":windows": ["java_tools/src/tools/singlejar/mapped_file_windows.inc"], - "//conditions:default": ["java_tools/src/tools/singlejar/mapped_file_posix.inc"], - }), - visibility = ["//visibility:private"], + select({ + ":windows": ["java_tools/src/tools/singlejar/mapped_file_windows.inc"], + "//conditions:default": ["java_tools/src/tools/singlejar/mapped_file_posix.inc"], + }), strip_include_prefix = "java_tools", + visibility = ["//visibility:private"], deps = [ + ":cpp_util", ":diag", ":singlejar_port", - ":cpp_util", ], ) @@ -590,11 +594,11 @@ "java_tools/src/tools/singlejar/input_jar.h", "java_tools/src/tools/singlejar/zip_headers.h", ], + strip_include_prefix = "java_tools", deps = [ ":diag", ":mapped_file", ], - strip_include_prefix = "java_tools", ) cc_library( @@ -604,11 +608,11 @@ "java_tools/src/tools/singlejar/options.h", ], hdrs = ["java_tools/src/tools/singlejar/options.h"], + strip_include_prefix = "java_tools", deps = [ ":diag", ":token_stream", ], - strip_include_prefix = "java_tools", ) cc_library( @@ -619,24 +623,24 @@ ":zip_headers", ], hdrs = ["java_tools/src/tools/singlejar/output_jar.h"], + strip_include_prefix = "java_tools", deps = [ ":combiners", + ":cpp_util", ":diag", ":input_jar", ":mapped_file", ":options", ":singlejar_port", - ":cpp_util", "//java_tools/zlib", ], - strip_include_prefix = "java_tools", ) cc_library( name = "token_stream", hdrs = ["java_tools/src/tools/singlejar/token_stream.h"], - deps = [":diag"], strip_include_prefix = "java_tools", + deps = [":diag"], ) filegroup(