Add support for passing custom bootclasspaths to java_common.compile

PiperOrigin-RevId: 540402695
Change-Id: I333b43ef3bd744c72cc2d0b51420ab4cfe4620ab

Author: cushon

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java

@@ -264,6 +264,7 @@ public JavaInfo createJavaCompileAction(
       List<Artifact> annotationProcessorAdditionalOutputs,
       String strictDepsMode,
       JavaToolchainProvider javaToolchain,
+      BootClassPathInfo bootClassPath,
       ImmutableList<Artifact> sourcepathEntries,
       List<Artifact> resources,
       List<Artifact> resourceJars,
@@ -350,6 +351,7 @@ public JavaInfo createJavaCompileAction(
         helper.build(
             javaSemantics,
             toolchainProvider,
+            bootClassPath,
             outputJarsBuilder,
             createOutputSourceJar,
             includeCompilationInfo,

src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java

@@ -216,6 +216,7 @@ public JavaLibraryHelper setCompilationStrictDepsMode(StrictDepsMode strictDepsM
   public JavaCompilationArtifacts build(
       JavaSemantics semantics,
       JavaToolchainProvider javaToolchainProvider,
+      BootClassPathInfo bootClassPath,
       JavaRuleOutputJarsProvider.Builder outputJarsBuilder,
       boolean createOutputSourceJar,
       boolean includeCompilationInfo,
@@ -232,6 +233,13 @@ public JavaCompilationArtifacts build(
         "outputSourceJar cannot be null when createOutputSourceJar is true");
 
     JavaTargetAttributes.Builder attributes = new JavaTargetAttributes.Builder(semantics);
+
+    if (bootClassPath != null && !bootClassPath.isEmpty()) {
+      attributes.setBootClassPath(bootClassPath);
+    } else {
+      bootClassPath = javaToolchainProvider.getBootclasspath();
+    }
+
     attributes.addSourceJars(sourceJars);
     attributes.addSourceFiles(sourceFiles);
     addDepsToAttributes(attributes);
@@ -296,10 +304,7 @@ public JavaCompilationArtifacts build(
     if (javaInfoBuilder != null && includeCompilationInfo) {
       ClasspathConfiguredFragment classpathFragment =
           new ClasspathConfiguredFragment(
-              javaArtifacts,
-              attributes.build(),
-              neverlink,
-              javaToolchainProvider.getBootclasspath());
+              javaArtifacts, attributes.build(), neverlink, bootClassPath);
 
       javaInfoBuilder.javaCompilationInfo(
           new JavaCompilationInfoProvider.Builder()

src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java

@@ -66,6 +66,7 @@ public class JavaStarlarkCommon
         Artifact,
         JavaInfo,
         JavaToolchainProvider,
+        BootClassPathInfo.Provider,
         ConstraintValueInfo,
         StarlarkRuleContext,
         StarlarkActionFactory> {
@@ -101,6 +102,7 @@ public JavaInfo createJavaCompileAction(
       Sequence<?> annotationProcessorAdditionalOutputs, // <Artifact> expected
       String strictDepsMode,
       JavaToolchainProvider javaToolchain,
+      Object bootClassPath,
       Object hostJavabase,
       Sequence<?> sourcepathEntries, // <Artifact> expected
       Sequence<?> resources, // <Artifact> expected
@@ -190,6 +192,7 @@ public JavaInfo createJavaCompileAction(
                 "annotation_processor_additional_outputs"),
             strictDepsMode,
             javaToolchain,
+            bootClassPath == Starlark.NONE ? null : (BootClassPathInfo) bootClassPath,
             ImmutableList.copyOf(Sequence.cast(sourcepathEntries, Artifact.class, "sourcepath")),
             Sequence.cast(resources, Artifact.class, "resources"),
             Sequence.cast(resourceJars, Artifact.class, "resource_jars"),

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaBootstrap.java

@@ -26,7 +26,7 @@
 /** {@link Bootstrap} for Starlark objects related to the java language. */
 public class JavaBootstrap implements Bootstrap {
 
-  private final JavaCommonApi<?, ?, ?, ?, ?, ?> javaCommonApi;
+  private final JavaCommonApi<?, ?, ?, ?, ?, ?, ?> javaCommonApi;
   private final JavaInfoProviderApi javaInfoProviderApi;
   private final JavaPluginInfoApi.Provider<?> javaPluginInfoProviderApi;
   private final ProguardSpecProviderApi.Provider<?> proguardSpecProvider;
@@ -38,7 +38,7 @@ public class JavaBootstrap implements Bootstrap {
           PackageIdentifier.createUnchecked("", "tools/build_defs/java"));
 
   public JavaBootstrap(
-      JavaCommonApi<?, ?, ?, ?, ?, ?> javaCommonApi,
+      JavaCommonApi<?, ?, ?, ?, ?, ?, ?> javaCommonApi,
       JavaInfoProviderApi javaInfoProviderApi,
       JavaPluginInfoApi.Provider<?> javaPluginInfoProviderApi,
       ProguardSpecProviderApi.Provider<?> proguardSpecProvider) {

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java

@@ -50,6 +50,7 @@ public interface JavaCommonApi<
         FileT extends FileApi,
         JavaInfoT extends JavaInfoApi<FileT, ?, ?>,
         JavaToolchainT extends JavaToolchainStarlarkApiProviderApi,
+        BootClassPathT extends ProviderApi,
         ConstraintValueT extends ConstraintValueInfoApi,
         StarlarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>,
         StarlarkActionFactoryT extends StarlarkActionFactoryApi>
@@ -190,6 +191,14 @@ public interface JavaCommonApi<
             positional = false,
             named = true,
             doc = "A JavaToolchainInfo to be used for this compilation. Mandatory."),
+        @Param(
+            name = "bootclasspath",
+            positional = false,
+            named = true,
+            defaultValue = "None",
+            doc =
+                "A BootClassPathInfo to be used for this compilation. If present, overrides the"
+                    + " bootclasspath associated with the provided java_toolchain. Optional."),
         @Param(
             name = "host_javabase",
             positional = false,
@@ -301,6 +310,7 @@ JavaInfoT createJavaCompileAction(
       Sequence<?> annotationProcessorAdditionalOutputs, // <FileT> expected.
       String strictDepsMode,
       JavaToolchainT javaToolchain,
+      Object bootClassPath,
       Object hostJavabase,
       Sequence<?> sourcepathEntries, // <FileT> expected.
       Sequence<?> resources, // <FileT> expected.