Description redacted.

--
MOS_MIGRATED_REVID=140613176

3 files changed, 1 insertions, 9 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 c7f11d8f29..ad427022d5 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
@@ -86,7 +86,6 @@ public final class CcCommon {
       CppRuleClasses.MODULE_MAPS,
       CppRuleClasses.MODULE_MAP_HOME_CWD,
       CppRuleClasses.HEADER_MODULE_INCLUDES_DEPENDENCIES,
-      CppRuleClasses.PRUNE_HEADER_MODULES,
       CppRuleClasses.INCLUDE_PATHS,
       CppRuleClasses.PIC,
       CppRuleClasses.PER_OBJECT_DEBUG_INFO,
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 b3af498339..ca4c17758c 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
@@ -276,8 +276,7 @@ public class CppCompileActionBuilder {
         shouldScanIncludes
             && useHeaderModules
             && !fake
-            && !getActionName().equals(CppCompileAction.CPP_MODULE_COMPILE)
-            && featureConfiguration.isEnabled(CppRuleClasses.PRUNE_HEADER_MODULES);
+            && !getActionName().equals(CppCompileAction.CPP_MODULE_COMPILE);
     if (useHeaderModules && !shouldPruneModules) {
       realMandatoryInputsBuilder.addTransitive(context.getTransitiveModules(usePic));
     }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index daae7b6f67..278e3b0a1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -232,12 +232,6 @@ public class CppRuleClasses {
       "header_module_includes_dependencies";
 
   /**
-   * A string constant for switching on that header modules are pruned based on the results of
-   * include scanning.
-   */
-  public static final String PRUNE_HEADER_MODULES = "prune_header_modules";
-
-  /**
    * A string constant for the no_legacy_features feature.
    *
    * <p>If this feature is enabled, Bazel will not extend the crosstool configuration with the