Remove gen jar info from JavaRuleOutputJarsProvider.

--
MOS_MIGRATED_REVID=103754313

1 files changed, 22 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
index 7237be676f..54f8449970 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java
@@ -49,6 +49,7 @@ import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider;
 import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider.SourceDirectory;
 import com.google.devtools.build.lib.rules.android.AndroidSdkProvider;
 import com.google.devtools.build.lib.rules.java.JavaExportsProvider;
+import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider;
 import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
 import com.google.devtools.build.lib.rules.java.JavaSourceInfoProvider;
 import com.google.devtools.build.lib.vfs.Path;
@@ -305,6 +306,12 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
       }
     }
 
+    JavaGenJarsProvider genJarsProvider =
+        base.getProvider(JavaGenJarsProvider.class);
+    if (genJarsProvider != null) {
+      collectGenJars(builder, genJarsProvider);
+    }
+
     Collection<Artifact> sourceFiles = getSources(base);
 
     for (Artifact sourceFile : sourceFiles) {
@@ -354,20 +361,24 @@ public class AndroidStudioInfoAspect implements ConfiguredAspectFactory {
     if (jarsBuilder.hasJar() || jarsBuilder.hasSourceJar()) {
       builder.addJars(jarsBuilder.build());
     }
+  }
 
-
+  private static void collectGenJars(JavaRuleIdeInfo.Builder builder,
+      JavaGenJarsProvider genJarsProvider) {
     LibraryArtifact.Builder genjarsBuilder = LibraryArtifact.newBuilder();
 
-    Artifact genClassJar = outputJarsProvider.getGenClassJar();
-    if (genClassJar != null) {
-      genjarsBuilder.setJar(makeArtifactLocation(genClassJar));
-    }
-    Artifact gensrcJar = outputJarsProvider.getGensrcJar();
-    if (gensrcJar != null) {
-      genjarsBuilder.setSourceJar(makeArtifactLocation(gensrcJar));
-    }
-    if (genjarsBuilder.hasJar() || genjarsBuilder.hasSourceJar()) {
-      builder.addGeneratedJars(genjarsBuilder.build());
+    if (genJarsProvider.usesAnnotationProcessing()) {
+      Artifact genClassJar = genJarsProvider.getGenClassJar();
+      if (genClassJar != null) {
+        genjarsBuilder.setJar(makeArtifactLocation(genClassJar));
+      }
+      Artifact gensrcJar = genJarsProvider.getGenSourceJar();
+      if (gensrcJar != null) {
+        genjarsBuilder.setSourceJar(makeArtifactLocation(gensrcJar));
+      }
+      if (genjarsBuilder.hasJar() || genjarsBuilder.hasSourceJar()) {
+        builder.addGeneratedJars(genjarsBuilder.build());
+      }
     }
   }