Use the crosstool feature configuration for all modules, layering and header

processing related flags.

--
MOS_MIGRATED_REVID=86898123

1 files changed, 2 insertions, 3 deletions

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 0f8ab42fb2..17fa62e609 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
@@ -74,7 +74,6 @@ public class FakeCppCompileAction extends CppCompileAction {
       ImmutableList<String> pluginOpts,
       Predicate<String> nocopts,
       ImmutableList<PathFragment> extraSystemIncludePrefixes,
-      boolean enableLayeringCheck,
       @Nullable String fdoBuildStamp) {
     super(owner, features, featureConfiguration, sourceFile, sourceLabel, mandatoryInputs,
         outputFile, dotdFile, null, null, null,
@@ -87,9 +86,9 @@ public class FakeCppCompileAction extends CppCompileAction {
         // the cc_fake_binary, and the runfiles must be determined at analysis
         // time, so they can't depend on the contents of the ".d" file.)
         CppCompilationContext.disallowUndeclaredHeaders(context), null, copts, pluginOpts, nocopts,
-        extraSystemIncludePrefixes, enableLayeringCheck, fdoBuildStamp, VOID_INCLUDE_RESOLVER,
+        extraSystemIncludePrefixes, fdoBuildStamp, VOID_INCLUDE_RESOLVER,
         ImmutableList.<IncludeScannable>of(),
-        GUID, /*compileHeaderModules=*/false, /*usePic=*/false);
+        GUID, /*usePic=*/false);
     this.tempOutputFile = Preconditions.checkNotNull(tempOutputFile);
   }