Don't ship a JDK to native singlejar actions

and update TODO about removing support for Java singlejar.

--
PiperOrigin-RevId: 142778715
MOS_MIGRATED_REVID=142778715

2 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
index 13bdf5d216..f6fb57bd3b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/DeployArchiveBuilder.java
@@ -263,8 +263,8 @@ public class DeployArchiveBuilder {
         ResourceSet.createWithRamCpuIo(/*memoryMb = */200.0, /*cpuUsage = */.2, /*ioUsage=*/.2);
 
     // If singlejar's name ends with .jar, it is Java application, otherwise it is native.
-    // TODO(asmundak): once b/28640279 is fixed (that is, the native singlejar is released),
-    // eliminate this check, allowing only native singlejar.
+    // TODO(asmundak): once https://github.com/bazelbuild/bazel/issues/2241 is fixed (that is,
+    // the native singlejar is used on windows) remove support for the Java implementation
     Artifact singlejar = getSingleJar(ruleContext);
     if (singlejar.getFilename().endsWith(".jar")) {
       ruleContext.registerAction(
@@ -287,7 +287,6 @@ public class DeployArchiveBuilder {
       ruleContext.registerAction(
           new SpawnAction.Builder()
               .addInputs(inputs.build())
-              .addTransitiveInputs(JavaHelper.getHostJavabaseInputs(ruleContext))
               .addOutput(outputJar)
               .setResources(resourceSet)
               .setExecutable(singlejar)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java
index f7398f449e..8f488ea4d7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/SingleJarActionBuilder.java
@@ -60,8 +60,8 @@ public final class SingleJarActionBuilder {
     Artifact singleJar = getSingleJar(ruleContext);
 
     // If singlejar's name ends with .jar, it is Java application, otherwise it is native.
-    // TODO(asmundak): once b/28640279 is fixed (that is, the native singlejar is released),
-    // eliminate this check, allowing only native singlejar.
+    // TODO(asmundak): once https://github.com/bazelbuild/bazel/issues/2241 is fixed (that is,
+    // the native singlejar is used on windows) remove support for the Java implementation
     if (singleJar.getFilename().endsWith(".jar")) {
       ruleContext.registerAction(
           new SpawnAction.Builder()
@@ -85,7 +85,6 @@ public final class SingleJarActionBuilder {
               .addOutput(outputJar)
               .addInputs(resources.values())
               .addInputs(resourceJars)
-              .addTransitiveInputs(hostJavabaseInputs)
               .setExecutable(singleJar)
               .setCommandLine(sourceJarCommandLine(outputJar, resources, resourceJars))
               .alwaysUseParameterFile(ParameterFileType.SHELL_QUOTED)