commit 67c9936ea130d33d92b67f7687490731080817ea
author ilist <ilist@google.com> Tue Jan 04 02:39:00 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 04 02:41:42 2022 -0800
tree 7826e9d44f2f60d2e0f85ea84654053de3c3cbeb
parent c63d9ecbe5fcb5716a0be21d8fc781d7aa5bbc30

Print "[for tool]" in progress message for both host and exec configuration.

Host configuration used to print "[for host]", whereas exec configuration prints no additional info. Printing something is potentially required by some integrations.

Changing "[for host]" to "[for tool]" might break some integrations, but in my opinion that's better than printing incorrect information.

PiperOrigin-RevId: 419548952

src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index 7787ab2..50f5f79 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -369,9 +369,9 @@
   }
 
   /**
-   * Returns a progress message string that is specific for this action. This is
-   * then annotated with additional information, currently the string '[for host]'
-   * for actions in the host configurations.
+   * Returns a progress message string that is specific for this action. This is then annotated with
+   * additional information, currently the string '[for tool]' for actions in the tool
+   * configurations.
    *
    * <p>A return value of null indicates no message should be reported.
    */

src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 6f8d8ad..3788fea 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -140,7 +140,7 @@
         Builder contextBuilder, ConfiguredTargetAndData prerequisite, Attribute attribute);
   }
 
-  private static final String HOST_CONFIGURATION_PROGRESS_TAG = "for host";
+  private static final String TOOL_CONFIGURATION_PROGRESS_TAG = "for tool";
 
   private final Rule rule;
   /**
@@ -542,7 +542,7 @@
         rule.getTargetKind(),
         configuration.checksum(),
         configuration.toBuildEvent(),
-        configuration.isHostConfiguration() ? HOST_CONFIGURATION_PROGRESS_TAG : null,
+        configuration.isToolConfiguration() ? TOOL_CONFIGURATION_PROGRESS_TAG : null,
         execProperties,
         executionPlatform);
   }