diff options
| author |  janakr <janakr@google.com> | 2018-02-14 14:08:45 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-14 14:10:01 -0800 |
| commit | 40d0077016dee31865af5246cbd6b2953d6386b3 (patch) | |
| tree | bc61c4057476ecfa5b25b6f37d2aa88bca05b7dd /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | ae52720bd38f1e1a29dc6d6910e6a0da95eb9236 (diff) | |
Start slimming down ToolchainResolutionKey: get rid of BuildConfiguration. The real blocker is PlatformInfo, which is coming.
PiperOrigin-RevId: 185742130
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index a5e12144f9..9d3f49cb26 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java @@ -357,7 +357,8 @@ public final class AspectFunction implements SkyFunction { aspect.getDescriptor().getDescription(), associatedConfiguredTargetAndTarget.getTarget().toString()), requiredToolchains, - aspectConfiguration); + aspectConfiguration, + key.getAspectConfigurationKey()); } catch (ToolchainContextException e) { // TODO(katre): better error handling throw new AspectCreationException(e.getMessage()); |