Re-add some of the targets removed recently
Commit c33ae8af469d615e490fbf503f7fad03e22ea1c6 removed some targets and replaced them with targets called "remote-X". This PR adds back the initial targets but now referencing remote tools.
Progress on #6316.
Closes #7506.
PiperOrigin-RevId: 235174166
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 0895451..1a4dba2 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -36,6 +36,7 @@
('*jarjar_command_deploy.jar',
lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
('*BUILD-new.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
+ ('*BUILD.javalangtools', lambda x: 'third_party/java/jdk/langtools/BUILD'),
('*singlejar_local.exe', lambda x: 'tools/jdk/singlejar/singlejar.exe'),
('*singlejar_local', lambda x: 'tools/jdk/singlejar/singlejar'),
('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
index 47683b4..d792d54 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
@@ -104,7 +104,7 @@
}))
.add(
attr("$jacocorunner", LABEL)
- .value(env.getToolsLabel("//tools/jdk:remote_jacoco_coverage_runner")))
+ .value(env.getToolsLabel("//tools/jdk:JacocoCoverageRunner")))
.addRequiredToolchains(CppRuleClasses.ccToolchainTypeAttribute(env))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
index ea51671..af0a9e8 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
@@ -73,7 +73,7 @@
"@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main")))
.add(
attr("$jacocorunner", LABEL)
- .value(env.getToolsLabel("//tools/jdk:remote_jacoco_coverage_runner")))
+ .value(env.getToolsLabel("//tools/jdk:JacocoCoverageRunner")))
/* <!-- #BLAZE_RULE(java_test).ATTRIBUTE(test_class) -->
The Java class to be loaded by the test runner.<br/>
<p>
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 70ba05b..5eb6f8f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -141,7 +141,7 @@
" ijar = ['ijar'],",
")",
"java_import(",
- " name = 'remote_jacoco_coverage_runner',",
+ " name = 'JacocoCoverageRunner',",
" jars = ['JacocoCoverage_jarjar_deploy.jar'],",
")",
"java_import(",
diff --git a/src/test/shell/integration/bazel_java_test.sh b/src/test/shell/integration/bazel_java_test.sh
index e23d546..219ecce 100755
--- a/src/test/shell/integration/bazel_java_test.sh
+++ b/src/test/shell/integration/bazel_java_test.sh
@@ -87,13 +87,13 @@
function test_javabase() {
mkdir -p zoo/bin
cat << EOF > BUILD
-load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_remote_java_toolchain", "JDK9_REMOTE_JVM_OPTS")
-default_remote_java_toolchain(
+load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", "JDK9_JVM_OPTS")
+default_java_toolchain(
name = "toolchain",
# Implicitly use the host_javabase bootclasspath, since the target doesn't
# exist in this test.
bootclasspath = [],
- jvm_opts = JDK9_REMOTE_JVM_OPTS,
+ jvm_opts = JDK9_JVM_OPTS,
visibility = ["//visibility:public"],
)
java_runtime(
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index b5c7ae8..6257f72 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -1,6 +1,6 @@
load(
"//tools/jdk:default_java_toolchain.bzl",
- "default_remote_java_toolchain",
+ "default_java_toolchain",
"java_runtime_files",
"JDK8_JVM_OPTS",
"bootclasspath",
@@ -151,52 +151,72 @@
exports_files(["BUILD.pkg"])
filegroup(
- name = "remote-genclass",
+ name = "genclass",
srcs = ["@remote_java_tools//:GenClass"],
)
filegroup(
- name = "remote-turbine",
+ name = "GenClass_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/GenClass_deploy.jar"],
+)
+
+filegroup(
+ name = "bazel-singlejar_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/bazel-singlejar_deploy.jar"],
+)
+
+filegroup(
+ name = "turbine",
srcs = ["@remote_java_tools//:Turbine"],
)
filegroup(
- name = "remote-turbine_direct",
+ name = "turbine_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/turbine_deploy.jar"],
+)
+
+filegroup(
+ name = "turbine_direct",
srcs = ["@remote_java_tools//:TurbineDirect"],
)
filegroup(
- name = "remote-javabuilder",
+ name = "turbine_direct_binary_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/turbine_direct_binary_deploy.jar"],
+)
+
+filegroup(
+ name = "javabuilder",
srcs = ["@remote_java_tools//:JavaBuilder"],
)
filegroup(
- name = "vanillajavabuilder",
- srcs = ["//tools/jdk:VanillaJavaBuilder_deploy.jar"],
+ name = "JavaBuilder_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/JavaBuilder_deploy.jar"],
)
filegroup(
- name = "remote-vanillajavabuilder",
+ name = "vanillajavabuilder",
srcs = ["@remote_java_tools//:VanillaJavaBuilder"],
)
filegroup(
- name = "remote-javac_jar",
+ name = "javac_jar",
srcs = ["@remote_java_tools//:javac_jar"],
)
filegroup(
- name = "remote-jdk_compiler_jar",
+ name = "jdk_compiler_jar",
srcs = ["@remote_java_tools//:jdk_compiler_jar"],
)
filegroup(
- name = "remote-java_compiler_jar",
+ name = "java_compiler_jar",
srcs = ["@remote_java_tools//:java_compiler_jar"],
)
java_import(
- name = "remote_jacoco_coverage_runner",
+ name = "JacocoCoverageRunner",
jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
)
@@ -205,11 +225,21 @@
jars = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],
)
+filegroup(
+ name = "TestRunner_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],
+)
+
java_import(
name = "ExperimentalTestRunner",
jars = ["@remote_java_tools//:java_tools/ExperimentalRunner_deploy.jar"],
)
+filegroup(
+ name = "ExperimentalRunner_deploy.jar",
+ srcs = ["@remote_java_tools//:java_tools/ExperimentalRunner_deploy.jar"],
+)
+
BOOTCLASS_JARS = [
"rt.jar",
"resources.jar",
@@ -268,29 +298,22 @@
target_javabase = "current_java_runtime",
)
-default_remote_java_toolchain(
+default_java_toolchain(
name = "toolchain_hostjdk8",
jvm_opts = JDK8_JVM_OPTS,
source_version = "8",
target_version = "8",
)
-default_remote_java_toolchain(
- name = "remote_toolchain_hostjdk8",
- jvm_opts = JDK8_JVM_OPTS,
- source_version = "8",
- target_version = "8",
-)
-
# Default to the Java 8 language level.
# TODO(cushon): consider if/when we should increment this?
-default_remote_java_toolchain(
+default_java_toolchain(
name = "toolchain",
source_version = "8",
target_version = "8",
)
-default_remote_java_toolchain(
+default_java_toolchain(
name = "remote_toolchain",
source_version = "8",
target_version = "8",
@@ -310,24 +333,17 @@
#
# However it does allow using a wider range of `--host_javabase`s, including
# versions newer than the current embedded JDK.
-default_remote_java_toolchain(
+default_java_toolchain(
name = "toolchain_vanilla",
forcibly_disable_header_compilation = True,
javabuilder = [":vanillajavabuilder"],
jvm_opts = [],
)
-default_remote_java_toolchain(
- name = "remote_toolchain_vanilla",
- forcibly_disable_header_compilation = True,
- javabuilder = ["@bazel_tools//tools/jdk:remote-vanillajavabuilder"],
- jvm_opts = [],
-)
-
RELEASES = (8, 9)
[
- default_remote_java_toolchain(
+ default_java_toolchain(
name = "toolchain_java%d" % release,
source_version = "%s" % release,
target_version = "%s" % release,
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index 759962c..3fdcfc1 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -15,10 +15,10 @@
"""Bazel rules for creating Java toolchains."""
JDK8_JVM_OPTS = [
- "-Xbootclasspath/p:$(location @bazel_tools//tools/jdk:remote-javac_jar)",
+ "-Xbootclasspath/p:$(location @bazel_tools//tools/jdk:javac_jar)",
]
-JDK9_REMOTE_JVM_OPTS = [
+JDK9_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",
@@ -34,8 +34,8 @@
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
# override the javac in the JDK.
- "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:remote-java_compiler_jar)",
- "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:remote-jdk_compiler_jar)",
+ "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)",
+ "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)",
# quiet warnings from com.google.protobuf.UnsafeUtil,
# see: https://github.com/google/protobuf/issues/3781
@@ -61,31 +61,30 @@
COMPATIBLE_JAVACOPTS = {
"proto": PROTO_JAVACOPTS,
}
-
-DEFAULT_REMOTE_TOOLCHAIN_CONFIGURATION = {
+DEFAULT_TOOLCHAIN_CONFIGURATION = {
"forcibly_disable_header_compilation": 0,
- "genclass": ["@bazel_tools//tools/jdk:remote-genclass"],
- "header_compiler": ["@bazel_tools//tools/jdk:remote-turbine"],
- "header_compiler_direct": ["@bazel_tools//tools/jdk:remote-turbine_direct"],
+ "genclass": ["@bazel_tools//tools/jdk:genclass"],
+ "header_compiler": ["@bazel_tools//tools/jdk:turbine"],
+ "header_compiler_direct": ["@bazel_tools//tools/jdk:turbine_direct"],
"ijar": ["@bazel_tools//tools/jdk:ijar"],
- "javabuilder": ["@bazel_tools//tools/jdk:remote-javabuilder"],
- "javac": ["@bazel_tools//tools/jdk:remote-javac_jar"],
+ "javabuilder": ["@bazel_tools//tools/jdk:javabuilder"],
+ "javac": ["@bazel_tools//tools/jdk:javac_jar"],
"tools": [
- "@bazel_tools//tools/jdk:remote-java_compiler_jar",
- "@bazel_tools//tools/jdk:remote-jdk_compiler_jar",
+ "@bazel_tools//tools/jdk:java_compiler_jar",
+ "@bazel_tools//tools/jdk:jdk_compiler_jar",
],
"javac_supports_workers": 1,
- "jvm_opts": JDK9_REMOTE_JVM_OPTS,
+ "jvm_opts": JDK9_JVM_OPTS,
"misc": DEFAULT_JAVACOPTS,
"compatible_javacopts": COMPATIBLE_JAVACOPTS,
"singlejar": ["@bazel_tools//tools/jdk:singlejar"],
"bootclasspath": ["@bazel_tools//tools/jdk:platformclasspath"],
}
-def default_remote_java_toolchain(name, **kwargs):
+def default_java_toolchain(name, **kwargs):
"""Defines a remote java_toolchain with appropriate defaults for Bazel."""
- toolchain_args = dict(DEFAULT_REMOTE_TOOLCHAIN_CONFIGURATION)
+ toolchain_args = dict(DEFAULT_TOOLCHAIN_CONFIGURATION)
toolchain_args.update(kwargs)
native.java_toolchain(
