Aspects-on-aspects implementation.

--
MOS_MIGRATED_REVID=139189444

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
index 785e7407f4..5d2c163ef8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.devtools.build.lib.analysis.AspectDescriptor;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.packages.AspectParameters;
@@ -77,12 +78,11 @@ public class ToplevelSkylarkAspectFunction implements SkyFunction {
       throw new LoadSkylarkAspectFunctionException(e);
     }
     SkyKey aspectKey =
-        AspectValue.key(
-            aspectLoadingKey.getTargetLabel(),
-            aspectLoadingKey.getAspectConfiguration(),
-            aspectLoadingKey.getTargetConfiguration(),
-            skylarkAspect.getAspectClass(),
-            AspectParameters.EMPTY);
+        ActionLookupValue.key(AspectValue.createAspectKey(
+            aspectLoadingKey.getTargetLabel(), aspectLoadingKey.getTargetConfiguration(),
+            new AspectDescriptor(skylarkAspect.getAspectClass(), AspectParameters.EMPTY),
+            aspectLoadingKey.getAspectConfiguration()
+        ));
 
     return env.getValue(aspectKey);
   }