Fix JDK7 compatibility.
MOS_MIGRATED_REVID=145119990
@@ -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);
