1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
index 00cb6f694b..4478e72548 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java
@@ -167,7 +167,11 @@ public final class BuildConfigurationCollection {
         ListMultimap<? extends SplitTransition<?>, BuildConfiguration> splitTransitionTable) {
       this.configuration = configuration;
       this.transitionTable = ImmutableMap.copyOf(transitionTable);
-      this.splitTransitionTable = ImmutableListMultimap.copyOf(splitTransitionTable);
+      // Do not remove <SplitTransition<?>, BuildConfiguration>:
+      // workaround for Java 7 type inference.
+      this.splitTransitionTable =
+          ImmutableListMultimap.<SplitTransition<?>, BuildConfiguration>copyOf(
+              splitTransitionTable);
     }
 
     public Map<? extends Transition, ConfigurationHolder> getTransitionTable() {