Remove the --incompatible_force_strict_header_check_from_starlark com…

…mand line option. RELNOTES[INC]: THe --incompatible_force_strict_header_check_from_starlark command line option is not available anymore. PiperOrigin-RevId: 569433918 Change-Id: Ia4dddb160b018f7ca2e22aa34ad2ddd2c7d874a3
bazelbuild · Sep 29, 2023 · 3f36464 · 3f36464
1 parent 0567176
commit 3f36464
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -116,10 +116,7 @@ public void finalizeCompileActionBuilder(
   @Override
   public HeadersCheckingMode determineStarlarkHeadersCheckingMode(
       RuleContext ruleContext, CppConfiguration cppConfig, CcToolchainProvider toolchain) {
-    if (cppConfig.strictHeaderCheckingFromStarlark()) {
-      return HeadersCheckingMode.STRICT;
-    }
-    return HeadersCheckingMode.LOOSE;
+    return HeadersCheckingMode.STRICT;
   }
 
   @Override

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -812,10 +812,6 @@ public boolean useSchedulingMiddlemen() {
     return cppOptions.useSchedulingMiddlemen;
   }
 
-  public boolean strictHeaderCheckingFromStarlark() {
-    return cppOptions.forceStrictHeaderCheckFromStarlark;
-  }
-
   public boolean useCppCompileHeaderMnemonic() {
     return cppOptions.useCppCompileHeaderMnemonic;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -949,15 +949,6 @@ public Label getMemProfProfileLabel() {
       help = "If enabled, the Starlark version of cc_import can be used.")
   public boolean experimentalStarlarkCcImport;
 
-  @Option(
-      name = "incompatible_force_strict_header_check_from_starlark",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS,
-      effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.CHANGES_INPUTS},
-      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-      help = "If enabled, set strict header checking in the Starlark API")
-  public boolean forceStrictHeaderCheckFromStarlark;
-
   @Option(
       name = "experimental_generate_llvm_lcov",
       defaultValue = "false",
@@ -1190,7 +1181,6 @@ public FragmentOptions getExec() {
     exec.ignoreParamFile = ignoreParamFile;
     exec.experimentalIncludeScanning = experimentalIncludeScanning;
     exec.enableCcTestFeature = enableCcTestFeature;
-    exec.forceStrictHeaderCheckFromStarlark = forceStrictHeaderCheckFromStarlark;
     exec.useCppCompileHeaderMnemonic = useCppCompileHeaderMnemonic;
 
     // Save host options for further use.