From 31dde99258b4dde999538b613bb4c65828cd62e6 Mon Sep 17 00:00:00 2001
From: Carmi Grushko <carmi@google.com>
Date: Tue, 3 Nov 2015 19:23:36 +0000
Subject: Pass AspectWithParameters instead of separately passing
 AspectParameters and aspect-attributes. The former contains both.

--
MOS_MIGRATED_REVID=106961145
---
 .../java/com/google/devtools/build/lib/skyframe/AspectFunction.java    | 3 +--
 1 file changed, 1 insertion(+), 2 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 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()) {
-- 
cgit v1.2.3