BuildConfiguration: prefer TreeMap over HashMap to obtain a stable order

--
MOS_MIGRATED_REVID=131069637

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index ec53d74de3..7e2cc6b14b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -1203,11 +1203,11 @@ public final class BuildConfiguration {
     // Shell environment variables specified via options take precedence over the
     // ones inherited from the fragments. In the long run, these fragments will
     // be replaced by appropriate default rc files anyway.
-    Map<String, String> shellEnv = new HashMap(builder.build());
+    Map<String, String> shellEnv = new TreeMap(builder.build());
     for (Map.Entry<String, String> entry : options.actionEnvironment) {
       shellEnv.put(entry.getKey(), entry.getValue());
     }
-    Map<String, String> fixedShellEnv = new HashMap(shellEnv);
+    Map<String, String> fixedShellEnv = new TreeMap(shellEnv);
     Set<String> variableShellEnv = new HashSet();
     for (Map.Entry<String, String> entry : shellEnv.entrySet()) {
       if (entry.getValue() == null) {