diff options
author | Chris Parsons <cparsons@google.com> | 2017-01-20 21:20:12 +0000 |
---|---|---|
committer | Laszlo Csomor <laszlocsomor@google.com> | 2017-01-23 09:52:40 +0000 |
commit | e670376bad1dd157a99feb77dabe37cb571994dc (patch) | |
tree | 6c3e6c7f88dc354d19a9f2c27a0e1ea8b6033f0a /src/main | |
parent | efb2f17075a3dbc3d5875699252db7e35a28c8d7 (diff) |
Fix JDK7 compatibility.
--
PiperOrigin-RevId: 145119990
MOS_MIGRATED_REVID=145119990
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java index 4a5692014d..40485cb627 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java @@ -35,7 +35,6 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap; import com.google.devtools.build.lib.analysis.actions.SymlinkAction; -import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -247,7 +246,6 @@ public final class CcLibraryHelper { } private final RuleContext ruleContext; - private final BuildConfiguration configuration; private final CppSemantics semantics; private final List<Artifact> publicHeaders = new ArrayList<>(); @@ -308,7 +306,6 @@ public final class CcLibraryHelper { FeatureConfiguration featureConfiguration, SourceCategory sourceCatagory) { this.ruleContext = Preconditions.checkNotNull(ruleContext); - this.configuration = ruleContext.getConfiguration(); this.semantics = Preconditions.checkNotNull(semantics); this.featureConfiguration = Preconditions.checkNotNull(featureConfiguration); this.sourceCategory = Preconditions.checkNotNull(sourceCatagory); @@ -932,7 +929,7 @@ public final class CcLibraryHelper { deps, /*generateDwo=*/ false, /*ltoBackendArtifactsUsePic=*/ false, /*ltoBackendArtifacts=*/ - ImmutableList.of()); + ImmutableList.<LTOBackendArtifacts>of()); Runfiles cppStaticRunfiles = collectCppRunfiles(ccLinkingOutputs, true); Runfiles cppSharedRunfiles = collectCppRunfiles(ccLinkingOutputs, false); |