diff options
| author |  John Cater <jcater@google.com> | 2018-02-28 07:52:21 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-28 07:53:50 -0800 |
| commit | e959e44a4363fc12ae2df2c5bc0cd0d12f80bbd9 (patch) | |
| tree | 70f26ae98d7c8d0457e9c79236480124580d4988 /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | e7d9e1f8aae459ec71cdb31f988661f4c3975ca8 (diff) | |
Update ToolchainUtil to properly load and use the available execution
platforms, and correctly merge together the results from TRF.
Part of #4442.
Change-Id: I31d83fa73a93d39a0e18d05a43a1c8666ac5a2d2
PiperOrigin-RevId: 187324257
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 | 1 |
1 files changed, 0 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 0f3b752d4e..54a0a370ad 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 @@ -358,7 +358,6 @@ public final class AspectFunction implements SkyFunction { aspect.getDescriptor().getDescription(), associatedConfiguredTargetAndTarget.getTarget().toString()), requiredToolchains, - aspectConfiguration, key.getAspectConfigurationKey()); } catch (ToolchainContextException e) { // TODO(katre): better error handling |