diff options
author | gregce <gregce@google.com> | 2017-09-12 23:58:34 +0200 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2017-09-13 19:06:29 +0200 |
commit | e0bbe757b3626fbbadbab798e6752ca086e9ff46 (patch) | |
tree | 7d58994baa09bdce6be8df4276e15d31aac9d057 /src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java | |
parent | 93d65a4473c9c963a190b433f359ef7e52273bd4 (diff) |
Remove outdated references to static vs. dynamic configurations.
PiperOrigin-RevId: 168452997
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java index 2b18dc8b01..ce60f42cfe 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java @@ -531,7 +531,7 @@ public final class ConfiguredTargetFunction implements SkyFunction { * Creates a dynamic configuration for each dep that's custom-fitted specifically for that dep. * * <p>More specifically: given a set of {@link Dependency} instances holding dynamic config - * transition requests (e.g. {@link Dependency#hasStaticConfiguration()} == false}), returns + * transition requests (e.g. {@link Dependency#hasExplicitConfiguration()} == false}), returns * equivalent dependencies containing dynamically created configurations applying those * transitions. If {@link BuildConfiguration.Options#trimConfigurations()} is true, these * configurations only contain the fragments needed by the dep and its transitive closure. Else @@ -618,7 +618,7 @@ public final class ConfiguredTargetFunction implements SkyFunction { // // A *lot* of targets have null deps, so this produces real savings. Profiling tests over a // simple cc_binary show this saves ~1% of total analysis phase time. - if (dep.hasStaticConfiguration()) { + if (dep.hasExplicitConfiguration()) { continue; } @@ -869,7 +869,7 @@ public final class ConfiguredTargetFunction implements SkyFunction { OrderedSetMultimap<Attribute, Dependency> result = OrderedSetMultimap.create(); for (Map.Entry<Attribute, Dependency> depsEntry : originalDeps.entries()) { AttributeAndLabel attrAndLabel = iterator.next(); - if (depsEntry.getValue().hasStaticConfiguration()) { + if (depsEntry.getValue().hasExplicitConfiguration()) { result.put(attrAndLabel.attribute, depsEntry.getValue()); } else { Collection<Dependency> dynamicAttrDeps = dynamicDeps.get(attrAndLabel); |