diff options
| author |  gregce <gregce@google.com> | 2017-08-18 21:20:29 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-21 14:15:59 +0200 |
| commit | 8529746358ff5d88dc7ddf584a85ba0aa1a269a8 (patch) | |
| tree | 5aa2c9f9e6f22b37d4d1c320d21fa4436545051b /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | |
| parent | 8158a286a8e72ec3f5259d155f6856fea9d07fea (diff) | |
Replace TransitionApplier interface with a dedicated class.
This accomplishes a few goals:
1. Removes the outdated BuildConfiguration.StaticConfigurationApplier code.
2. Removes the TransitionApplier abstraction completely. This was an awkward
bridge meant to support both static and dynamic implementations.
3. Moves transition logic to its own dedicated class: ConfigurationResolver.
This no longer belongs in BuildConfiguration, which we ultimately want to
become a simple <key, value> map.
Part of the static config cleanup effort.
PiperOrigin-RevId: 165736955
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index 90773dc07d..f05c5a424b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -54,7 +54,6 @@ import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.Package; -import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.LoadingFailureEvent; import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner; @@ -108,7 +107,7 @@ public final class SkyframeBuildView { private Set<SkyKey> dirtiedConfiguredTargetKeys = Sets.newConcurrentHashSet(); private volatile boolean anyConfiguredTargetDeleted = false; - private final RuleClassProvider ruleClassProvider; + private final ConfiguredRuleClassProvider ruleClassProvider; // The host configuration containing all fragments used by this build's transitive closure. private BuildConfiguration topLevelHostConfiguration; @@ -554,7 +553,7 @@ public final class SkyframeBuildView { } SkyframeDependencyResolver createDependencyResolver(Environment env) { - return new SkyframeDependencyResolver(env); + return new SkyframeDependencyResolver(env, ruleClassProvider.getDynamicTransitionMapper()); } /** |