Expose two methods from JavaSkylarkApiProvider in JavaInfo

JavaSkylarkApiProvider will be deprecated soon and replaced by JavaInfo.
Methods exposed:
getCompilationInfoProvider()
getTransitiveExports()

Changed signature of JavaCommon methods to accept JavaInfoBuilder.

RELNOTES:none
PiperOrigin-RevId: 178229835

1 files changed, 19 insertions, 12 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index 78d49c8015..7dfcc4ba2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -702,13 +702,16 @@ public class JavaCommon {
 
   public void addTransitiveInfoProviders(
       RuleConfiguredTargetBuilder builder,
+      JavaInfo.Builder javaInfoBuilder,
       NestedSet<Artifact> filesToBuild,
       @Nullable Artifact classJar) {
-    addTransitiveInfoProviders(builder, filesToBuild, classJar, JAVA_COLLECTION_SPEC);
+    addTransitiveInfoProviders(
+        builder, javaInfoBuilder, filesToBuild, classJar, JAVA_COLLECTION_SPEC);
   }
 
   public void addTransitiveInfoProviders(
       RuleConfiguredTargetBuilder builder,
+      JavaInfo.Builder javaInfoBuilder,
       NestedSet<Artifact> filesToBuild,
       @Nullable Artifact classJar,
       InstrumentationSpec instrumentationSpec) {
@@ -723,6 +726,9 @@ public class JavaCommon {
         .add(JavaExportsProvider.class, exportsProvider)
         .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE, getFilesToCompile(classJar))
         .add(JavaCompilationInfoProvider.class, compilationInfoProvider);
+
+    javaInfoBuilder.addProvider(JavaExportsProvider.class, exportsProvider);
+    javaInfoBuilder.addProvider(JavaCompilationInfoProvider.class, compilationInfoProvider);
   }
 
   private static InstrumentedFilesProvider getInstrumentationFilesProvider(RuleContext ruleContext,
@@ -737,23 +743,24 @@ public class JavaCommon {
         /*withBaselineCoverage*/!TargetUtils.isTestRule(ruleContext.getTarget()));
   }
 
-  public JavaGenJarsProvider createJavaGenJarsProvider(
-      @Nullable Artifact genClassJar, @Nullable Artifact genSourceJar) {
-    return collectTransitiveGenJars(
-        javaCompilationHelper.usesAnnotationProcessing(), genClassJar, genSourceJar);
-  }
-
-  public void addJavaGenJarsProvider(
+  public void addGenJarsProvider(
       RuleConfiguredTargetBuilder builder,
-      JavaGenJarsProvider javaGenJarsProvider) {
+      JavaInfo.Builder javaInfoBuilder,
+      @Nullable Artifact genClassJar,
+      @Nullable Artifact genSourceJar) {
+    JavaGenJarsProvider genJarsProvider = collectTransitiveGenJars(
+        javaCompilationHelper.usesAnnotationProcessing(),
+        genClassJar, genSourceJar);
 
     NestedSetBuilder<Artifact> genJarsBuilder = NestedSetBuilder.stableOrder();
-    genJarsBuilder.addTransitive(javaGenJarsProvider.getTransitiveGenClassJars());
-    genJarsBuilder.addTransitive(javaGenJarsProvider.getTransitiveGenSourceJars());
+    genJarsBuilder.addTransitive(genJarsProvider.getTransitiveGenClassJars());
+    genJarsBuilder.addTransitive(genJarsProvider.getTransitiveGenSourceJars());
 
     builder
-        .addProvider(javaGenJarsProvider)
+        .add(JavaGenJarsProvider.class, genJarsProvider)
         .addOutputGroup(JavaSemantics.GENERATED_JARS_OUTPUT_GROUP, genJarsBuilder.build());
+
+    javaInfoBuilder.addProvider(JavaGenJarsProvider.class, genJarsProvider);
   }
 
   /**