From 30bf44c92e48e8b89b0577d88153b36b9ccf5bf8 Mon Sep 17 00:00:00 2001 From: mjhalupka Date: Thu, 25 Jan 2018 08:22:34 -0800 Subject: Remove ConfiguredTarget.getTarget() from AspectFunction and replace it with a ConfiguredTargetAndTarget.getTarget(). PiperOrigin-RevId: 183241259 --- .../com/google/devtools/build/lib/skyframe/AspectFunction.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java') 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 = -- cgit v1.2.3