aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
diff options
context:
space:
mode:
authorGravatar juliexxia <juliexxia@google.com>2018-03-16 08:32:31 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-03-16 08:33:43 -0700
commitb892a9a8d2d3d1f923c0032ee08908179cfbf276 (patch)
tree62e4aab78a66edb0ba897b38abce53ace4d25d74 /src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
parentec5f5be59042d631ef89469eb5750f5e012fd94a (diff)
Refactor DependencyResolver#dependentNodeMap to take in a set of toolchain labels instead of the entire toolchain context since that's all the dependency resolver really needs. This will help make cquery transitions outputter easier to implement.
PiperOrigin-RevId: 189342812
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index ea70f6ebdc..2df73d1791 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -404,7 +404,9 @@ public final class ConfiguredTargetFunction implements SkyFunction {
hostConfiguration,
aspects,
configConditions,
- toolchainContext,
+ toolchainContext == null
+ ? ImmutableSet.of()
+ : toolchainContext.getResolvedToolchainLabels(),
transitiveLoadingRootCauses);
} catch (EvalException e) {
// EvalException can only be thrown by computed Skylark attributes in the current rule.