Add method to `SkyframeExecutor` which returns top-level analysis phase keys.
@@ -2244,11 +2244,20 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory, Configur
.build();
EvaluationResult<ActionLookupValue> result =
memoizingEvaluator.evaluate(
- Iterables.concat(configuredTargetKeys, topLevelAspectKeys), evaluationContext);
+ analysisPhaseKeys(configuredTargetKeys, topLevelAspectKeys), evaluationContext);
perCommandSyscallCache.noteAnalysisPhaseEnded();
return result;
}
+ /**
+ * Returns top-level analysis phase keys, {@link ConfiguredTargetKey} and {@link
+ * TopLevelAspectsKey}.
+ */
+ protected Iterable<? extends SkyKey> analysisPhaseKeys(
+ Iterable<ConfiguredTargetKey> ctKeys, Iterable<TopLevelAspectsKey> aspectKeys) {
+ return Iterables.concat(ctKeys, aspectKeys);
+ }
+
/**
* Evaluates the given collections of CT/Aspect BuildDriverKeys. This is part of
* https://github.com/bazelbuild/bazel/issues/14057, internal: b/147350683.
