diff options
| author |  mjhalupka <mjhalupka@google.com> | 2018-01-25 08:22:34 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-25 08:24:27 -0800 |
| commit | 30bf44c92e48e8b89b0577d88153b36b9ccf5bf8 (patch) | |
| tree | 4f78c1942102170ea952300e802a139be306443d /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | 152e464375a85d801c78deefbbac0329a3a43675 (diff) | |
Remove ConfiguredTarget.getTarget() from AspectFunction and replace it with a
ConfiguredTargetAndTarget.getTarget().
PiperOrigin-RevId: 183241259
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 | 7 |
1 files changed, 4 insertions, 3 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 a50a9c4a02..e861ab0d23 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 @@ -290,12 +290,13 @@ public final class AspectFunction implements SkyFunction { associatedTarget = getBaseTarget( associatedTarget, key.getBaseKeys(), values); } catch (DuplicateException e) { - env.getListener().handle( - Event.error(associatedTarget.getTarget().getLocation(), e.getMessage())); + env.getListener() + .handle( + Event.error( + associatedConfiguredTargetAndTarget.getTarget().getLocation(), e.getMessage())); throw new AspectFunctionException( new AspectCreationException(e.getMessage(), associatedTarget.getLabel())); - } } associatedConfiguredTargetAndTarget = |