diff options
| author |  gregce <gregce@google.com> | 2017-12-28 11:58:15 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-28 11:59:56 -0800 |
| commit | 4e093d8e08454c9c2c04e94fe2e97ef4592198b6 (patch) | |
| tree | cde1332470f53d3a45a68b6852a207bc6851d8e2 /src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java | |
| parent | 8bd201631e380327f5a7fb72e11bd493973913b8 (diff) | |
Replace Attribute.ConfigurationTransition with config.transitions.ConfigurationTransitionProxy.
The "proxy" part is to dissuade people from writing:
void myfunc(ConfigurationTransition transition)
signatures casually.
Maybe that's actually a better name than "Transition". But I'd rather
rename Transition to ConfigurationTransition in its own change if we
want to do that.
PiperOrigin-RevId: 180285321
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java index d268e7d2b3..87145f86c6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java @@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.config.PatchTransition; import com.google.devtools.build.lib.analysis.config.TransitionResolver; +import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransitionProxy; import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.analysis.config.transitions.Transition; import com.google.devtools.build.lib.cmdline.Label; @@ -727,7 +728,7 @@ public abstract class DependencyResolver { ruleConfig, rule, attributeAndOwner.attribute, toTarget, attributeMap); outgoingEdges.put( attributeAndOwner.attribute, - transition == Attribute.ConfigurationTransition.NULL + transition == ConfigurationTransitionProxy.NULL ? Dependency.withNullConfiguration(depLabel) : Dependency.withTransitionAndAspects(depLabel, transition, requiredAspects(attributeAndOwner, toTarget))); |