diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2016-10-19 10:06:38 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-10-19 10:53:09 +0000 |
| commit | 529fe5ccd200562bcea066adce932e3639bdae05 (patch) | |
| tree | 7033e2838d7a4bdc55b813e62c746a3472897433 /src/main/java/com/google | |
| parent | e6191f7209ebf3f67480bc7aa9db5ac58beb2156 (diff) | |
Add type arguments for JDK7 build.
--
MOS_MIGRATED_REVID=136575806
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 543f35e87d..f2690c6062 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 @@ public class CppLinkActionBuilder { isLTOIndexing ? new CppLinkVariablesExtension( configuration, - ImmutableMap.of(), + ImmutableMap.<Artifact, Artifact>of(), needWholeArchive, linkerInputs, runtimeLinkerInputs, 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 9d9cafd5e3..cce4a824a1 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 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver 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. |