Change the way protos report their output.

--
MOS_MIGRATED_REVID=122846987

3 files changed, 27 insertions, 9 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 5562b2e24f..27a97bce36 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
@@ -383,6 +383,9 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
       outputBuilder.setTestInfo(builder);
     }
 
+    androidStudioInfoSemantics.augmentRuleInfo(
+        outputBuilder, base, ruleContext, ideResolveArtifacts);
+
     AndroidStudioInfoFilesProvider provider = providerBuilder.build();
 
     outputBuilder.addAllDependencies(transform(dependenciesResult.deps, LABEL_TO_STRING));
@@ -542,7 +545,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
         /*makeExecutable =*/ false);
   }
 
-  protected static ArtifactLocation makeArtifactLocation(Artifact artifact) {
+  public static ArtifactLocation makeArtifactLocation(Artifact artifact) {
     return makeArtifactLocation(artifact.getRoot(), artifact.getRootRelativePath());
   }
 
@@ -570,7 +573,7 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
         .build();
   }
 
-  private static JavaRuleIdeInfo makeJavaRuleIdeInfo(
+  private JavaRuleIdeInfo makeJavaRuleIdeInfo(
       ConfiguredTarget base,
       RuleContext ruleContext,
       JavaRuleOutputJarsProvider outputJarsProvider,
@@ -640,8 +643,8 @@ public class AndroidStudioInfoAspect extends NativeAspectClass implements Config
       builder.addTransitiveSystemIncludeDirectory(pathFragment.getSafePathString());
     }
 
-    androidStudioInfoSemantics
-        .updateCppRuleInfo(builder, base, ruleContext, cppCompilationContext, ideResolveArtifacts);
+    androidStudioInfoSemantics.augmentCppRuleInfo(
+        builder, base, ruleContext, cppCompilationContext, ideResolveArtifacts);
 
     return builder.build();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
index 01234f2abb..9c06f3334e 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoSemantics.java
@@ -13,27 +13,35 @@
 // limitations under the License.
 package com.google.devtools.build.lib.ideinfo;
 
-import com.google.common.collect.ImmutableList.Builder;
+import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.ideinfo.AndroidStudioInfoAspect.PrerequisiteAttr;
 import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.CRuleIdeInfo;
+import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.RuleIdeInfo;
 import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
 
 /**
  * Methods to handle differences between blaze and bazel in the {@link AndroidStudioInfoAspect}.
  */
 public interface AndroidStudioInfoSemantics {
-  void updateCppRuleInfo(
+
+  void augmentPrerequisiteAttrs(ImmutableList.Builder<PrerequisiteAttr> builder);
+
+  void augmentRuleInfo(
+      RuleIdeInfo.Builder builder,
+      ConfiguredTarget base,
+      RuleContext ruleContext,
+      NestedSetBuilder<Artifact> ideResolveArtifacts);
+
+  void augmentCppRuleInfo(
       CRuleIdeInfo.Builder builder,
       ConfiguredTarget base,
       RuleContext ruleContext,
       CppCompilationContext cppCompilationContext,
       NestedSetBuilder<Artifact> ideResolveArtifacts);
 
-  void augmentPrerequisiteAttrs(Builder<PrerequisiteAttr> builder);
-
   boolean checkForAdditionalCppRules(String ruleClass);
 }
diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java b/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
index 1aa3dc9590..96933a7dd9 100644
--- a/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/ideinfo/BazelAndroidStudioInfoSemantics.java
@@ -20,6 +20,7 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.ideinfo.AndroidStudioInfoAspect.PrerequisiteAttr;
 import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.CRuleIdeInfo.Builder;
+import com.google.devtools.build.lib.ideinfo.androidstudio.AndroidStudioIdeInfo.RuleIdeInfo;
 import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
 
 /**
@@ -28,7 +29,7 @@ import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
 public class BazelAndroidStudioInfoSemantics implements AndroidStudioInfoSemantics {
 
   @Override
-  public void updateCppRuleInfo(
+  public void augmentCppRuleInfo(
       Builder builder,
       ConfiguredTarget base,
       RuleContext ruleContext,
@@ -41,6 +42,12 @@ public class BazelAndroidStudioInfoSemantics implements AndroidStudioInfoSemanti
   }
 
   @Override
+  public void augmentRuleInfo(RuleIdeInfo.Builder builder, ConfiguredTarget base,
+      RuleContext ruleContext,
+      NestedSetBuilder<Artifact> ideResolveArtifacts) {
+  }
+
+  @Override
   public boolean checkForAdditionalCppRules(String ruleClass) {
     return false;
   }