Use two configurations for AspectKeys.

In order for Aspects to support dynamic configuration, they need to have two
configurations: one to instantiate the Aspect with, containing all the fragment
dependencies of the Aspect itself, and one to create the ConfiguredTargetValue.key
with, containing only the dependencies of the Rule. This expands AspectKey to
have a second configuration, although it currently does not populate that key with
anything different.

--
MOS_MIGRATED_REVID=115997454

1 files changed, 1 insertions, 0 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 571911115d..ed93b8e659 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
@@ -75,6 +75,7 @@ public class ToplevelSkylarkAspectFunction implements SkyFunction {
     SkyKey aspectKey =
         AspectValue.key(
             aspectLoadingKey.getTargetLabel(),
+            aspectLoadingKey.getAspectConfiguration(),
             aspectLoadingKey.getTargetConfiguration(),
             skylarkAspect.getAspectClass(),
             AspectParameters.EMPTY);