Create gen source jar in java_common.compile().

PiperOrigin-RevId: 193029216

1 files changed, 13 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index faab225a5e..fdd0c26082 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -479,8 +479,18 @@ public final class JavaCompilationHelper {
    * @param manifestProto The artifact for the manifest proto emitted from JavaBuilder
    * @param genClassJar The artifact for the gen jar to output
    */
-  public void createGenJarAction(Artifact classJar, Artifact manifestProto,
+  public void createGenJarAction(
+      Artifact classJar,
+      Artifact manifestProto,
       Artifact genClassJar) {
+    createGenJarAction(
+        classJar, manifestProto, genClassJar, JavaRuntimeInfo.forHost(getRuleContext()));
+  }
+
+  public void createGenJarAction(Artifact classJar,
+      Artifact manifestProto,
+      Artifact genClassJar,
+      JavaRuntimeInfo hostJavabase) {
     getRuleContext()
         .registerAction(
             new SpawnAction.Builder()
@@ -488,9 +498,9 @@ public final class JavaCompilationHelper {
                 .addInput(classJar)
                 .addOutput(genClassJar)
                 .addTransitiveInputs(
-                    JavaRuntimeInfo.forHost(getRuleContext()).javaBaseInputsMiddleman())
+                    hostJavabase.javaBaseInputsMiddleman())
                 .setJarExecutable(
-                    JavaCommon.getHostJavaExecutable(ruleContext),
+                    JavaCommon.getHostJavaExecutable(hostJavabase),
                     getGenClassJar(ruleContext),
                     javaToolchain.getJvmOptions())
                 .addCommandLine(