Create a new proto output formatter for cquery. Also add flag --[no]proto:include_configurations which when used, makes cquery proto output appear exactly like query proto output so tools that are already using this can seamlessly transition.

PiperOrigin-RevId: 192470626

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
index 4014f825a1..bae38019ac 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
@@ -52,6 +52,7 @@ import com.google.devtools.build.lib.query2.engine.QueryUtil.ThreadSafeMutableKe
 import com.google.devtools.build.lib.query2.engine.QueryUtil.UniquifierImpl;
 import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
 import com.google.devtools.build.lib.query2.engine.Uniquifier;
+import com.google.devtools.build.lib.query2.output.AspectResolver;
 import com.google.devtools.build.lib.query2.output.CqueryOptions;
 import com.google.devtools.build.lib.query2.output.QueryOptions;
 import com.google.devtools.build.lib.rules.AliasConfiguredTarget;
@@ -210,15 +211,19 @@ public class ConfiguredTargetQueryEnvironment
       CqueryOptions options,
       Reporter reporter,
       SkyframeExecutor skyframeExecutor,
-      BuildConfiguration hostConfiguration) {
+      BuildConfiguration hostConfiguration,
+      AspectResolver resolver) {
     OutputStream out = reporter.getOutErr().getOutputStream();
     return new ImmutableList.Builder<CqueryThreadsafeCallback>()
         .add(
             new LabelAndConfigurationOutputFormatterCallback(
-                reporter, options, out, skyframeExecutor))
+                reporter, options, out, skyframeExecutor, accessor))
         .add(
             new TransitionsOutputFormatterCallback(
                 reporter, options, out, skyframeExecutor, accessor, hostConfiguration))
+        .add(
+            new ProtoOutputFormatterCallback(
+                reporter, options, out, skyframeExecutor, accessor, resolver))
         .build();
   }
 
@@ -660,3 +665,4 @@ public class ConfiguredTargetQueryEnvironment
     return parser.getOptions(QueryOptions.class);
   }
 }
+