Allow ProtoOutputFormatter to filter aspect attributes

--
MOS_MIGRATED_REVID=119902657

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
index e8fa723003..023a0282bf 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
@@ -181,10 +181,10 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
       // Add information about additional attributes from aspects.
       for (Entry<Attribute, Collection<Label>> entry : aspectsDependencies.asMap().entrySet()) {
         Attribute attribute = entry.getKey();
-        if (!includeAttribute(rule, attribute)) {
+        Collection<Label> labels = entry.getValue();
+        if (!includeAspectAttribute(attribute, labels)) {
           continue;
         }
-        Collection<Label> labels = entry.getValue();
         Object attributeValue = getAspectAttributeValue(attribute, labels);
         Build.Attribute serializedAttribute =
             AttributeSerializer.getAttributeProto(
@@ -345,6 +345,11 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
     return true;
   }
 
+  /** Allow filtering of aspect attributes. */
+  protected boolean includeAspectAttribute(Attribute attr, Collection<Label> value) {
+    return true;
+  }
+
   protected boolean includeRuleDefinitionEnvironment() {
     return true;
   }