1 files changed, 14 insertions, 33 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index 4e79ea0363..3afa030e1c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -300,17 +300,8 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory {
 
     RuleConfiguredTargetBuilder ruleBuilder = new RuleConfiguredTargetBuilder(ruleContext);
     addTransitiveInfoProviders(
-        ruleContext,
-        cppConfiguration,
-        common,
-        ruleBuilder,
-        filesToBuild,
-        ccCompilationOutputs,
-        cppCompilationContext,
-        linkingOutputs,
-        dwoArtifacts,
-        transitiveLipoInfo,
-        fake);
+        ruleContext, cppConfiguration, common, ruleBuilder, filesToBuild, ccCompilationOutputs,
+        cppCompilationContext, linkingOutputs, dwoArtifacts, transitiveLipoInfo, fake);
 
     Map<Artifact, IncludeScannable> scannableMap = new LinkedHashMap<>();
     if (cppConfiguration.isLipoContextCollector()) {
@@ -595,33 +586,23 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory {
     InstrumentedFilesProvider instrumentedFilesProvider = common.getInstrumentedFilesProvider(
         instrumentedObjectFiles, !TargetUtils.isTestRule(ruleContext.getRule()) && !fake);
 
-    NestedSet<Artifact> filesToCompile = ccCompilationOutputs.getFilesToCompile(
-        cppConfiguration.isLipoContextCollector(), CppHelper.usePic(ruleContext, false));
     builder
         .setFilesToBuild(filesToBuild)
         .add(CppCompilationContext.class, cppCompilationContext)
         .add(TransitiveLipoInfoProvider.class, transitiveLipoInfo)
-        .add(
-            CcExecutionDynamicLibrariesProvider.class,
-            new CcExecutionDynamicLibrariesProvider(
-                collectExecutionDynamicLibraryArtifacts(
-                    ruleContext, linkingOutputs.getExecutionDynamicLibraries())))
-        .add(
-            CcNativeLibraryProvider.class,
-            new CcNativeLibraryProvider(
-                collectTransitiveCcNativeLibraries(
-                    ruleContext, linkingOutputs.getDynamicLibraries())))
+        .add(CcExecutionDynamicLibrariesProvider.class,
+            new CcExecutionDynamicLibrariesProvider(collectExecutionDynamicLibraryArtifacts(
+                ruleContext, linkingOutputs.getExecutionDynamicLibraries())))
+        .add(CcNativeLibraryProvider.class, new CcNativeLibraryProvider(
+            collectTransitiveCcNativeLibraries(ruleContext, linkingOutputs.getDynamicLibraries())))
         .add(InstrumentedFilesProvider.class, instrumentedFilesProvider)
-        .add(
-            CppDebugFileProvider.class,
-            new CppDebugFileProvider(
-                dwoArtifacts.getDwoArtifacts(), dwoArtifacts.getPicDwoArtifacts()))
-        .addOutputGroup(
-            OutputGroupProvider.TEMP_FILES, getTemps(cppConfiguration, ccCompilationOutputs))
-        .addOutputGroup(
-            OutputGroupProvider.FILES_TO_COMPILE, filesToCompile)
-        .addOutputGroup(
-            OutputGroupProvider.COMPILATION_PREREQUISITES,
+        .add(CppDebugFileProvider.class, new CppDebugFileProvider(
+            dwoArtifacts.getDwoArtifacts(), dwoArtifacts.getPicDwoArtifacts()))
+        .addOutputGroup(OutputGroupProvider.TEMP_FILES,
+            getTemps(cppConfiguration, ccCompilationOutputs))
+        .addOutputGroup(OutputGroupProvider.FILES_TO_COMPILE,
+            common.getFilesToCompile(ccCompilationOutputs))
+        .addOutputGroup(OutputGroupProvider.COMPILATION_PREREQUISITES,
             CcCommon.collectCompilationPrerequisites(ruleContext, cppCompilationContext));
   }