Add cc transitive headers to ide-resolve output group

Both source and generated hdrs are included in the output group.
Might be cleaner to only include generated headers -- perhaps by
adding a new field to CppCompilationContext. This solution seems
lighter-weight, however.

--
MOS_MIGRATED_REVID=126725901

1 files changed, 5 insertions, 3 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 feddc68261..a7161f811a 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
@@ -341,7 +341,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
         ruleContext.registerAction(
             makePackageManifestAction(ruleContext,
                 packageManifest,
-                getJavaSourcefForPackageManifest(ruleContext)));
+                getJavaSourceForPackageManifest(ruleContext)));
       }
 
       JavaRuleIdeInfo javaRuleIdeInfo = makeJavaRuleIdeInfo(
@@ -432,7 +432,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
 
   @Nullable private static Artifact createPackageManifest(ConfiguredTarget base,
       RuleContext ruleContext) {
-    Collection<Artifact> sourceFiles = getJavaSourcefForPackageManifest(ruleContext);
+    Collection<Artifact> sourceFiles = getJavaSourceForPackageManifest(ruleContext);
     if (sourceFiles.isEmpty()) {
       return null;
     }
@@ -646,6 +646,8 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
       builder.addSource(makeArtifactLocation(sourceFile));
     }
 
+    ideResolveArtifacts.addTransitive(cppCompilationContext.getDeclaredIncludeSrcs());
+
     builder.addAllRuleInclude(getIncludes(ruleContext));
     builder.addAllRuleDefine(getDefines(ruleContext));
     builder.addAllRuleCopt(getCopts(ruleContext));
@@ -768,7 +770,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
     }
   }
 
-  private static Collection<Artifact> getJavaSourcefForPackageManifest(RuleContext ruleContext) {
+  private static Collection<Artifact> getJavaSourceForPackageManifest(RuleContext ruleContext) {
     Collection<Artifact> srcs = getSources(ruleContext);
     List<Artifact> javaSrcs = Lists.newArrayList();
     for (Artifact src : srcs) {