cquery should ignore action conflicts.
cquery can be used to investigate action conflicts, but only if it does not stop analysis in order to report them.
Fixes #13140.
PiperOrigin-RevId: 360481502
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 239ae1e..077e652 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -206,6 +206,7 @@
List<String> aspects,
AnalysisOptions viewOptions,
boolean keepGoing,
+ boolean checkForActionConflicts,
int loadingPhaseThreads,
TopLevelArtifactContext topLevelOptions,
ExtendedEventHandler eventHandler,
@@ -415,7 +416,8 @@
eventBus,
keepGoing,
loadingPhaseThreads,
- viewOptions.strictConflictChecks);
+ viewOptions.strictConflictChecks,
+ checkForActionConflicts);
setArtifactRoots(skyframeAnalysisResult.getPackageRoots());
} finally {
skyframeBuildView.clearInvalidatedActionLookupKeys();