diff options
| author |  cpeyser <cpeyser@google.com> | 2018-02-02 07:06:31 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-02 07:08:38 -0800 |
| commit | 757fe08b455d8b88fd89505a506c7303988cc639 (patch) | |
| tree | 331f75016b7cf2930650bf9e88d8e749c62ab665 /src/main/java/com/google/devtools/build/lib | |
| parent | 925746669fffacfd9d3395260eb79657f7dd9207 (diff) | |
ConfiguredRuleClassProvider preserves order in its builtin map.
PiperOrigin-RevId: 184280067
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index 858ae01f96..4132f4e58e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java @@ -25,6 +25,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -826,7 +827,8 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { /** Returns all skylark objects in global scope for this RuleClassProvider. */ public Map<String, Object> getTransitiveGlobalBindings() { - return globals.getTransitiveBindings(); + // TODO(brandjon): Remove unordered hash maps from Environment so we don't have to sort here. + return ImmutableSortedMap.copyOf(globals.getTransitiveBindings()); } /** Returns all registered {@link BuildConfiguration.Fragment} classes. */ |