Restore sane behavior after a really bad merge (?) in commit a85bf4b19c680a6db11f21758847dc88ec0aa658.

The bad merge undid part of the behavior around pruning header modules and also
passed in "shouldPruneModules" as "usePic".

--
MOS_MIGRATED_REVID=132846871

3 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index d257656e8d..7a4eb0e7e8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -164,6 +164,7 @@ public class CppCompileAction extends AbstractAction
   private final Artifact optionalSourceFile;
   private final NestedSet<Artifact> mandatoryInputs;
   private final boolean shouldScanIncludes;
+  private final boolean shouldPruneModules;
   private final boolean usePic;
   private final CppCompilationContext context;
   private final Iterable<IncludeScannable> lipoScannables;
@@ -239,6 +240,7 @@ public class CppCompileAction extends AbstractAction
       CcToolchainFeatures.Variables variables,
       Artifact sourceFile,
       boolean shouldScanIncludes,
+      boolean shouldPruneModules,
       boolean usePic,
       Label sourceLabel,
       NestedSet<Artifact> mandatoryInputs,
@@ -284,6 +286,7 @@ public class CppCompileAction extends AbstractAction
     // known after inclusion scanning. When *not* scanning includes,
     // the inputs are as declared, hence known, and remain so.
     this.shouldScanIncludes = shouldScanIncludes;
+    this.shouldPruneModules = shouldPruneModules;
     this.usePic = usePic;
     this.inputsKnown = !shouldScanIncludes;
     this.cppCompileCommandLine =
@@ -445,7 +448,7 @@ public class CppCompileAction extends AbstractAction
       return null;
     }
 
-    if (featureConfiguration.isEnabled(CppRuleClasses.PRUNE_HEADER_MODULES)) {
+    if (shouldPruneModules) {
       Set<Artifact> initialResultSet = Sets.newLinkedHashSet(initialResult);
       List<String> usedModulePaths = Lists.newArrayList();
       for (Artifact usedModule : context.getUsedModules(usePic, initialResultSet)) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
index 3b146269a0..00a26ce192 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -318,6 +318,7 @@ public class CppCompileActionBuilder {
           sourceFile,
           shouldScanIncludes,
           shouldPruneModules,
+          usePic,
           sourceLabel,
           realMandatoryInputs,
           outputFile,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
index 97fe0825fe..8bf556bc5a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -90,6 +90,7 @@ public class FakeCppCompileAction extends CppCompileAction {
         sourceFile,
         shouldScanIncludes,
         shouldPruneModules,
+        usePic,
         sourceLabel,
         mandatoryInputs,
         outputFile,