diff options
| author |  cparsons <cparsons@google.com> | 2017-10-11 01:21:46 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-10-11 10:58:35 +0200 |
| commit | 8882192897fa3453d51fe907d19f948215a581af (patch) | |
| tree | 209ba3549f34835a19a50c8689a02c33546afa65 /src/main/java/com/google/devtools/build/lib/analysis/config | |
| parent | 78927792c77a6468607e215034c22b0641553f77 (diff) | |
SplitTransitionProvider no longer requires the attributes it uses are "Non Configurable"
RELNOTES: None.
PiperOrigin-RevId: 171751391
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/TransitionResolver.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/TransitionResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/config/TransitionResolver.java index ebcefb6eb2..289f4453f6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/TransitionResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/TransitionResolver.java @@ -19,6 +19,7 @@ import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition; import com.google.devtools.build.lib.packages.Attribute.SplitTransition; import com.google.devtools.build.lib.packages.Attribute.Transition; +import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper; import com.google.devtools.build.lib.packages.InputFile; import com.google.devtools.build.lib.packages.PackageGroup; import com.google.devtools.build.lib.packages.Rule; @@ -63,7 +64,7 @@ public final class TransitionResolver { * {@link Attribute.ConfigurationTransition}). */ public Transition evaluateTransition(BuildConfiguration fromConfig, final Rule fromRule, - final Attribute attribute, final Target toTarget) { + final Attribute attribute, final Target toTarget, ConfiguredAttributeMapper attributeMap) { // I. Input files and package groups have no configurations. We don't want to duplicate them. if (usesNullConfiguration(toTarget)) { @@ -112,7 +113,7 @@ public final class TransitionResolver { // The "else" is a legacy restriction from static configurations. if (attribute.hasSplitConfigurationTransition()) { currentTransition = split(currentTransition, - (SplitTransition<BuildOptions>) attribute.getSplitTransition(fromRule)); + (SplitTransition<BuildOptions>) attribute.getSplitTransition(attributeMap)); } else { // III. Attributes determine configurations. The configuration of a prerequisite is determined // by the attribute. |