When no new configured targets have been analyzed, only check for artifact conflicts if the current set of configured targets is not a subset of the largest set of configured targets that have been checked for conflicts.

Also rework the flow between SkyframeBuildView and SkyframeActionExecutor to remove the SkyframeExecutor middleman.

Also reword the error message in case of an ArtifactPrefixConflictException, since a clean should no longer be necessary.

PiperOrigin-RevId: 207322139

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
index 243c73c499..8ecd13e1a7 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactPrefixConflictException.java
@@ -28,7 +28,7 @@ public class ArtifactPrefixConflictException extends Exception {
         String.format(
             "output path '%s' (belonging to %s) is a prefix of output path '%s' (belonging to %s). "
                 + "These actions cannot be simultaneously present; please rename one of the output "
-                + "files or, as a last resort, run 'clean' and then build just one of them",
+                + "files or build just one of them",
             firstPath, firstOwner, secondPath, secondOwner));
   }
 }