Make ide_build_info work again with targets that have configurable attributes.

This fixed some fallout from commit 7894c18dbaf237a1c02d76beabe6ca54faf5039a. I also audited all the sites that change introduced ImmutableMap.Builder at.

--
MOS_MIGRATED_REVID=122738945

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
index 3289d173a6..d342bb66a4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
@@ -38,6 +38,7 @@ import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -149,14 +150,14 @@ public class PostConfiguredTargetFunction implements SkyFunction {
     if (env.valuesMissing()) {
       return null;
     }
-    ImmutableMap.Builder<Label, ConfigMatchingProvider> conditions = ImmutableMap.builder();
+    Map<Label, ConfigMatchingProvider> conditions = new LinkedHashMap<>();
     for (Map.Entry<SkyKey, SkyValue> entry : cts.entrySet()) {
       Label label = ((ConfiguredTargetKey) entry.getKey().argument()).getLabel();
       ConfiguredTarget ct = ((ConfiguredTargetValue) entry.getValue()).getConfiguredTarget();
       conditions.put(label, Preconditions.checkNotNull(
           ct.getProvider(ConfigMatchingProvider.class)));
     }
-    return conditions.build();
+    return ImmutableMap.copyOf(conditions);
   }
 
   @Nullable