cquery output: change the output config to be "HOST" for targets configured in the host config instead of the usual hash of options.

PiperOrigin-RevId: 183293164

1 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 9b68d8f3e1..c511ced77b 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -482,13 +482,14 @@ public final class BuildTool {
               public void processOutput(Iterable<ConfiguredTarget> partialResult)
                   throws IOException, InterruptedException {
                 for (ConfiguredTarget configuredTarget : partialResult) {
-                  env.getReporter()
-                      .getOutErr()
-                      .printOutLn(
-                          configuredTarget.getLabel()
-                              + " ("
-                              + configuredTarget.getConfiguration()
-                              + ")");
+                  BuildConfiguration config = configuredTarget.getConfiguration();
+                  StringBuilder output =
+                      new StringBuilder()
+                          .append(configuredTarget.getLabel())
+                          .append(" (")
+                          .append(config != null && config.isHostConfiguration() ? "HOST" : config)
+                          .append(")");
+                  env.getReporter().getOutErr().printOutLn(output.toString());
                 }
               }
             });