Propagate java_outputs in flavors of java_proto_library and inclu…

…de `compileJdeps`. PiperOrigin-RevId: 376700982
bazelbuild · May 31, 2021 · f1b37b5 · f1b37b5
1 parent 1f52e9a
commit f1b37b5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -191,6 +191,10 @@ void addProviders(ConfiguredAspect.Builder aspect) throws InterruptedException {
                         .setClassJar(outputJar)
                         .setCompileJar(compileTimeJar)
                         .addSourceJar(sourceJar)
+                        .setCompileJdeps(
+                            generatedCompilationArgsProvider
+                                .getCompileTimeJavaDependencyArtifacts()
+                                .getSingleton())
                         .build())
                 .build();
         JavaSourceJarsProvider sourceJarsProvider =

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
@@ -71,6 +71,10 @@ public ConfiguredTarget create(final RuleContext ruleContext)
         JavaSourceJarsProvider.merge(
             ruleContext.getPrerequisites("deps", JavaSourceJarsProvider.class));
 
+    JavaRuleOutputJarsProvider outputJarsProvider =
+        JavaRuleOutputJarsProvider.merge(
+            ruleContext.getPrerequisites("deps", JavaRuleOutputJarsProvider.class));
+
     NestedSetBuilder<Artifact> filesToBuild = NestedSetBuilder.stableOrder();
 
     filesToBuild.addAll(sourceJarsProvider.getSourceJars());
@@ -85,7 +89,7 @@ public ConfiguredTarget create(final RuleContext ruleContext)
         JavaInfo.Builder.create()
             .addProvider(JavaCompilationArgsProvider.class, dependencyArgsProviders)
             .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider)
-            .addProvider(JavaRuleOutputJarsProvider.class, JavaRuleOutputJarsProvider.EMPTY)
+            .addProvider(JavaRuleOutputJarsProvider.class, outputJarsProvider)
             .addProvider(
                 JavaCcInfoProvider.class, createCcLinkingInfo(ruleContext, ImmutableList.of()))
             .setJavaConstraints(ImmutableList.of("android"))

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
@@ -224,6 +224,10 @@ void addProviders(ConfiguredAspect.Builder aspect) throws InterruptedException {
                         .setClassJar(outputJar)
                         .setCompileJar(compileTimeJar)
                         .addSourceJar(sourceJar)
+                        .setCompileJdeps(
+                            generatedCompilationArgsProvider
+                                .getCompileTimeJavaDependencyArtifacts()
+                                .getSingleton())
                         .build())
                 .build();
         JavaSourceJarsProvider sourceJarsProvider =

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
@@ -68,6 +68,10 @@ public ConfiguredTarget create(final RuleContext ruleContext)
         JavaSourceJarsProvider.merge(
             ruleContext.getPrerequisites("deps", JavaSourceJarsProvider.class));
 
+    JavaRuleOutputJarsProvider outputJarsProvider =
+        JavaRuleOutputJarsProvider.merge(
+            ruleContext.getPrerequisites("deps", JavaRuleOutputJarsProvider.class));
+
     NestedSetBuilder<Artifact> filesToBuild = NestedSetBuilder.stableOrder();
 
     filesToBuild.addAll(sourceJarsProvider.getSourceJars());
@@ -80,7 +84,7 @@ public ConfiguredTarget create(final RuleContext ruleContext)
         JavaInfo.Builder.create()
             .addProvider(JavaCompilationArgsProvider.class, dependencyArgsProviders)
             .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider)
-            .addProvider(JavaRuleOutputJarsProvider.class, JavaRuleOutputJarsProvider.EMPTY);
+            .addProvider(JavaRuleOutputJarsProvider.class, outputJarsProvider);
 
     RuleConfiguredTargetBuilder result =
         new RuleConfiguredTargetBuilder(ruleContext)