commit 04f6f245ae42bf53afa4f587591dba796f9c06cd
author Michael Staib <mstaib@google.com> Tue Mar 01 15:40:29 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Tue Mar 01 19:13:36 2016 +0000
tree 094f60decddb14d65e5166b4cb701c9d55fcc34c
parent fc7797954072a7a8c02652ef15a06e9efd738865

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

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index e48a1b1..b67ba2e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -464,6 +464,9 @@
           aspectKeys.add(
               AspectValue.createSkylarkAspectKey(
                   targetSpec.getLabel(),
+                  // For invoking top-level aspects, use the top-level configuration for both the
+                  // aspect and the base target while the top-level configuration is untrimmed.
+                  targetSpec.getConfiguration(),
                   targetSpec.getConfiguration(),
                   bzlFile,
                   skylarkFunctionName));
@@ -477,6 +480,9 @@
             aspectKeys.add(
                 AspectValue.createAspectKey(
                     targetSpec.getLabel(),
+                    // For invoking top-level aspects, use the top-level configuration for both the
+                    // aspect and the base target while the top-level configuration is untrimmed.
+                    targetSpec.getConfiguration(),
                     targetSpec.getConfiguration(),
                     new NativeAspectClass<ConfiguredNativeAspectFactory>(aspectFactoryClass)));
           }