Skip to content

Commit d4625cf

Browse files
djasper-ghcopybara-github
authored andcommitted
Remove experimental option now that this can also be controlled via a crosstool feature.
PiperOrigin-RevId: 518082572 Change-Id: I3612690169216dacc32092d54f15b255c16fd3da
1 parent d629bbe commit d4625cf

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,14 @@ public static class BuildGraveyardOptions extends OptionsBase {
281281
help = "Deprecated no-op. Use --experimental_dynamic_local_load_factor instead.")
282282
@Deprecated
283283
public boolean skipFirstBuild;
284+
285+
@Option(
286+
name = "experimental_parse_headers_skipped_if_corresponding_srcs_found",
287+
defaultValue = "false",
288+
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
289+
effectTags = {OptionEffectTag.NO_OP},
290+
help = "No-op.")
291+
public boolean parseHeadersSkippedIfCorrespondingSrcsFound;
284292
}
285293

286294
/** This is where deprecated Bazel-specific options only used by the build command go to die. */

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,8 +1438,7 @@ private CcCompilationOutputs createCcCompileActions() throws RuleErrorException
14381438
// These are already handled above.
14391439
continue;
14401440
}
1441-
if (cppConfiguration.getParseHeadersSkippedIfCorrespondingSrcsFound()
1442-
&& featureConfiguration.isEnabled(CppRuleClasses.VALIDATES_LAYERING_CHECK_IN_TEXTUAL_HDRS)
1441+
if (featureConfiguration.isEnabled(CppRuleClasses.VALIDATES_LAYERING_CHECK_IN_TEXTUAL_HDRS)
14431442
&& compiledBasenames.contains(
14441443
Files.getNameWithoutExtension(artifact.getExecPathString()))) {
14451444
continue;

src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,6 @@ public boolean getInmemoryDotdFiles() {
497497
return cppOptions.inmemoryDotdFiles;
498498
}
499499

500-
public boolean getParseHeadersSkippedIfCorrespondingSrcsFound() {
501-
return cppOptions.parseHeadersSkippedIfCorrespondingSrcsFound;
502-
}
503-
504500
public boolean getUseInterfaceSharedLibraries() {
505501
return cppOptions.useInterfaceSharedObjects;
506502
}

src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -749,16 +749,6 @@ public Label getPropellerOptimizeLabel() {
749749
+ "build nodes instead of being written to disk.")
750750
public boolean inmemoryDotdFiles;
751751

752-
@Option(
753-
name = "experimental_parse_headers_skipped_if_corresponding_srcs_found",
754-
defaultValue = "false",
755-
documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
756-
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS},
757-
help =
758-
"If enabled, the parse_headers feature does not create a separate header compile action "
759-
+ "if a source with the same basename is found in the same target.")
760-
public boolean parseHeadersSkippedIfCorrespondingSrcsFound;
761-
762752
@Option(
763753
name = "experimental_omitfp",
764754
defaultValue = "false",
@@ -1249,7 +1239,6 @@ public FragmentOptions getExec() {
12491239
exec.disableNoCopts = disableNoCopts;
12501240
exec.loadCcRulesFromBzl = loadCcRulesFromBzl;
12511241
exec.validateTopLevelHeaderInclusions = validateTopLevelHeaderInclusions;
1252-
exec.parseHeadersSkippedIfCorrespondingSrcsFound = parseHeadersSkippedIfCorrespondingSrcsFound;
12531242
exec.strictSystemIncludes = strictSystemIncludes;
12541243
exec.useArgsParamsFile = useArgsParamsFile;
12551244
exec.ignoreParamFile = ignoreParamFile;

0 commit comments

Comments
 (0)