commit 529fe5ccd200562bcea066adce932e3639bdae05
author Janak Ramakrishnan <janakr@google.com> Wed Oct 19 10:06:38 2016 +0000
committer Philipp Wollermann <philwo@google.com> Wed Oct 19 10:53:09 2016 +0000
tree 7033e2838d7a4bdc55b813e62c746a3472897433
parent e6191f7209ebf3f67480bc7aa9db5ac58beb2156

Add type arguments for JDK7 build.

--
MOS_MIGRATED_REVID=136575806

src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
index 543f35e..f2690c6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -554,7 +554,7 @@
         isLTOIndexing
             ? new CppLinkVariablesExtension(
                 configuration,
-                ImmutableMap.of(),
+                ImmutableMap.<Artifact, Artifact>of(),
                 needWholeArchive,
                 linkerInputs,
                 runtimeLinkerInputs,

src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
index 9d9cafd..cce4a82 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
@@ -609,7 +609,7 @@
             expandedArtifacts.put(input, expansionBuilder.build());
           } else if (value instanceof TreeArtifactValue) {
             TreeArtifactValue treeValue = (TreeArtifactValue) value;
-            expandedArtifacts.put(input, ImmutableSet.copyOf(treeValue.getChildren()));
+            expandedArtifacts.put(input, ImmutableSet.<Artifact>copyOf(treeValue.getChildren()));
             inputArtifactData.putAll(treeValue.getChildValues());
 
             // Again, we cache the "digest" of the value for cache checking.