diff options
| author |  Carmi Grushko <carmi@google.com> | 2015-11-03 19:23:36 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-11-04 16:08:34 +0000 |
| commit | 31dde99258b4dde999538b613bb4c65828cd62e6 (patch) | |
| tree | c51abb34d71c3a2cee605b526b449700c73c81c2 /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | 454bc6de6ff96027ffac24caf1fc3235a01d0729 (diff) | |
Pass AspectWithParameters instead of separately passing AspectParameters and aspect-attributes.
The former contains both.
--
MOS_MIGRATED_REVID=106961145
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, 1 insertions, 2 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 41af5ff3f2..1206ccee1d 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 @@ -224,10 +224,9 @@ public final class AspectFunction implements SkyFunction { return null; } - AspectParameters aspectParams = key.getParameters(); Aspect aspect = view.createAspect( analysisEnvironment, associatedTarget, aspectFactory, directDeps, configConditions, - aspectParams, key.getAspect().getDefinition(aspectParams).getAttributes()); + key.getAspectWithParameters()); events.replayOn(env.getListener()); if (events.hasErrors()) { |