Do not include generated sources in the IDE package manifests.

The IDE doesn't add generated sources. Including these causes
execution of actions that generate sources, including building
whatever tools they need. This is not necessary for the IDE
stage.

--
MOS_MIGRATED_REVID=123004127

2 files changed, 26 insertions, 2 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 27a97bce36..619150a553 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
@@ -744,7 +744,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
     Collection<Artifact> srcs = getSources(ruleContext);
     List<Artifact> javaSrcs = Lists.newArrayList();
     for (Artifact src : srcs) {
-      if (src.getRootRelativePathString().endsWith(".java")) {
+      if (src.isSourceArtifact() && src.getRootRelativePathString().endsWith(".java")) {
         javaSrcs.add(src);
       }
     }
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
index f9a1b49e83..a8bdeb1af4 100644
--- a/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspectTest.java
@@ -103,7 +103,31 @@ public class AndroidStudioInfoAspectTest extends AndroidStudioInfoAspectTestBase
     assertNotNull(packageManifest);
     assertEquals(packageManifest.getRelativePath(), "com/google/example/simple.manifest");
   }
-  
+
+  @Test
+  public void testPackageManifestNotCreatedForOnlyGeneratedSources() throws Exception {
+    if (!isNativeTest()) {
+      return;
+    }
+
+    scratch.file(
+        "com/google/example/BUILD",
+        "genrule(",
+        "   name = 'gen_sources',",
+        "   outs = ['Gen.java'],",
+        "   cmd = '',",
+        ")",
+        "java_library(",
+        "    name = 'simple',",
+        "    srcs = [':gen_sources']",
+        ")");
+    Map<String, RuleIdeInfo> ruleIdeInfos = buildRuleIdeInfo("//com/google/example:simple");
+    assertThat(ruleIdeInfos.size()).isEqualTo(1);
+    RuleIdeInfo ruleIdeInfo = getRuleInfoAndVerifyLabel(
+        "//com/google/example:simple", ruleIdeInfos);
+    assertThat(ruleIdeInfo.getJavaRuleIdeInfo().hasPackageManifest()).isFalse();
+  }
+
   @Test
   public void testJavaLibraryWithDependencies() throws Exception {
     scratch.file(