Remove 6 no-op CLI flags
* `--incompatible_cc_coverage`
Documented as no-op from v0.26.0.
* `--glibc`
Documented as no-op from v0.16.0
* `--experimental_use_fork_join_pool`
Documented as no-op from v7.
* `--experimental_use_priority_in_analysis`
Introduced in v7 preview, no-op by time of v7 release.
* `--incompatible_generated_protos_in_virtual_imports`
Documented as no-op from v7.
* `--expand_configs_in_place`
Documented as no-op from v0.16.0
Closes #23375.
PiperOrigin-RevId: 670898998
Change-Id: If86643a90019969dd37c7439b8d99dfe34d8f68c
diff --git a/site/en/remote/bep-glossary.md b/site/en/remote/bep-glossary.md
index 678f6ac..7f2336c 100644
--- a/site/en/remote/bep-glossary.md
+++ b/site/en/remote/bep-glossary.md
@@ -244,7 +244,6 @@
"--output_user_root=/tmp/.cache/bazel/_bazel_foo",
"--output_base=/tmp/.cache/bazel/_bazel_foo/a61fd0fbee3f9d6c1e30d54b68655d35",
"--deep_execroot",
- "--expand_configs_in_place",
"--idle_server_tasks",
"--write_command_log",
"--nowatchfs",
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 64b14f7..c59beb8 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -424,11 +424,6 @@
startup_options.failure_detail_out.AsCommandLineArgument());
}
- if (startup_options.expand_configs_in_place) {
- result.push_back("--expand_configs_in_place");
- } else {
- result.push_back("--noexpand_configs_in_place");
- }
if (!startup_options.digest_function.empty()) {
// Only include this if a value is requested - we rely on the empty case
// being "null" to set the programmatic default in the server.
diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index 553025d..ede1016 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -89,7 +89,6 @@
preemptible(false),
java_logging_formatter(
"com.google.devtools.build.lib.util.SingleLineFormatter"),
- expand_configs_in_place(true),
digest_function(),
idle_server_tasks(true),
original_startup_options_(std::vector<RcStartupFlag>()),
@@ -139,8 +138,6 @@
RegisterNullaryStartupFlag("block_for_lock", &block_for_lock);
RegisterNullaryStartupFlag("client_debug", &client_debug);
RegisterNullaryStartupFlag("preemptible", &preemptible);
- RegisterNullaryStartupFlag("expand_configs_in_place",
- &expand_configs_in_place);
RegisterNullaryStartupFlag("fatal_event_bus_exceptions",
&fatal_event_bus_exceptions);
RegisterNullaryStartupFlag("host_jvm_debug", &host_jvm_debug);
diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index 66f882d..416535f 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -252,8 +252,6 @@
// Value of the java.util.logging.FileHandler.formatter Java property.
std::string java_logging_formatter;
- bool expand_configs_in_place;
-
// The hash function to use when computing file digests.
std::string digest_function;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
index 624362c..f068555 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
@@ -343,26 +343,6 @@
public String makeVariableSource;
@Option(
- name = "incompatible_cc_coverage",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.NO_OP},
- oldName = "experimental_cc_coverage",
- metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE, OptionMetadataTag.DEPRECATED},
- help = "Obsolete, no effect.")
- public boolean useGcovCoverage;
-
- @Deprecated
- @Option(
- name = "glibc",
- defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.NO_OP},
- metadataTags = {OptionMetadataTag.DEPRECATED},
- help = "Deprecated no-op.")
- public String glibc;
-
- @Option(
name = "force_ignore_dash_static",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
@@ -516,33 +496,6 @@
public boolean useEventBasedBuildCompletionStatus;
@Option(
- name = "experimental_use_fork_join_pool",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- metadataTags = OptionMetadataTag.DEPRECATED,
- effectTags = {OptionEffectTag.NO_OP},
- help = "No-op.")
- public boolean useForkJoinPool;
-
- @Option(
- name = "experimental_use_priority_in_analysis",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- metadataTags = OptionMetadataTag.DEPRECATED,
- effectTags = {OptionEffectTag.NO_OP},
- help = "No-op.")
- public boolean usePrioritization;
-
- @Option(
- name = "incompatible_generated_protos_in_virtual_imports",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.NO_OP},
- metadataTags = {OptionMetadataTag.DEPRECATED},
- help = "No-op.")
- public boolean generatedProtosInVirtualImports;
-
- @Option(
name = "experimental_java_proto_add_allowed_public_imports",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index 33b0273..fd5150f 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -414,19 +414,6 @@
help = "The hash function to use when computing file digests.")
public DigestHashFunction digestHashFunction;
- @Deprecated
- @Option(
- name = "expand_configs_in_place",
- defaultValue = "true", // NOTE: only for documentation, value is always passed by the client.
- documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
- effectTags = {OptionEffectTag.NO_OP},
- metadataTags = {OptionMetadataTag.DEPRECATED},
- deprecationWarning = "This option is now a no-op and will soon be deleted.",
- help =
- "Changed the expansion of --config flags to be done in-place, as opposed to in a fixed "
- + "point expansion between normal rc options and command-line specified options.")
- public boolean expandConfigsInPlace;
-
@Option(
name = "idle_server_tasks",
defaultValue = "true", // NOTE: only for documentation, value is set and used by the client.
