Rollback of commit 4fdd66db55d36c923b1e9fa30a158e1596408670.

*** Reason for rollback ***

The change this relies on is to be rolled back.

--
MOS_MIGRATED_REVID=113564031

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index 49715198c4..2ede292346 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 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;
+import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -459,6 +460,14 @@ public final class CcCommon {
         CppFileTypes.LINKER_SCRIPT);
   }
 
+  NestedSet<Artifact> getFilesToCompile(CcCompilationOutputs compilationOutputs) {
+    if (cppConfiguration.isLipoContextCollector()) {
+      return NestedSetBuilder.emptySet(Order.STABLE_ORDER);
+    }
+    return NestedSetBuilder.wrap(Order.STABLE_ORDER,
+        compilationOutputs.getObjectFiles(CppHelper.usePic(ruleContext, false)));
+  }
+
   InstrumentedFilesProvider getInstrumentedFilesProvider(Iterable<Artifact> files,
       boolean withBaselineCoverage) {
     return cppConfiguration.isLipoContextCollector()