Fix ClasspathConfiguredFragment bootclasspath collection

Previously it was only collecting custom per-rule bootclasspaths (e.g. from
android_library, which uses android.jar instead of the default Java
bootclasspath). This allows the java.compilation_info.boot_classpath Skylark
provider to work for regular Java rules.

--
MOS_MIGRATED_REVID=117031832

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ClasspathConfiguredFragment.java b/src/main/java/com/google/devtools/build/lib/rules/java/ClasspathConfiguredFragment.java
index 89d32700ff..7a34dcc4c8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ClasspathConfiguredFragment.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ClasspathConfiguredFragment.java
@@ -37,15 +37,18 @@ public final class ClasspathConfiguredFragment {
    * @param attributes the processed attributes of this Java target
    * @param isNeverLink whether to leave runtimeClasspath empty
    */
-  public ClasspathConfiguredFragment(JavaCompilationArtifacts javaArtifacts,
-      JavaTargetAttributes attributes, boolean isNeverLink) {
+  public ClasspathConfiguredFragment(
+      JavaCompilationArtifacts javaArtifacts,
+      JavaTargetAttributes attributes,
+      boolean isNeverLink,
+      ImmutableList<Artifact> bootClasspath) {
     if (!isNeverLink) {
       runtimeClasspath = getRuntimeClasspathList(attributes, javaArtifacts);
     } else {
       runtimeClasspath = NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER);
     }
     compileTimeClasspath = attributes.getCompileTimeClassPath();
-    bootClasspath = attributes.getBootClassPath();
+    this.bootClasspath = bootClasspath;
   }
 
   public ClasspathConfiguredFragment() {