RELNOTES[INC]: The startup flag --blaze_cpu is removed,
--
MOS_MIGRATED_REVID=113556731
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 673b1b9..667f626 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -265,9 +265,6 @@
if (!globals->options.skyframe.empty()) {
result.push_back("--skyframe=" + globals->options.skyframe);
}
- if (globals->options.blaze_cpu) {
- result.push_back("--blaze_cpu=true");
- }
if (globals->options.allow_configurable_attributes) {
result.push_back("--allow_configurable_attributes");
diff --git a/src/main/cpp/blaze_startup_options.cc b/src/main/cpp/blaze_startup_options.cc
index 697583d..6da01ce 100644
--- a/src/main/cpp/blaze_startup_options.cc
+++ b/src/main/cpp/blaze_startup_options.cc
@@ -52,7 +52,6 @@
io_nice_level(rhs.io_nice_level),
max_idle_secs(rhs.max_idle_secs),
skyframe(rhs.skyframe),
- blaze_cpu(rhs.blaze_cpu),
watchfs(rhs.watchfs),
allow_configurable_attributes(rhs.allow_configurable_attributes),
option_sources(rhs.option_sources),
diff --git a/src/main/cpp/blaze_startup_options.h b/src/main/cpp/blaze_startup_options.h
index f635db4..024be74 100644
--- a/src/main/cpp/blaze_startup_options.h
+++ b/src/main/cpp/blaze_startup_options.h
@@ -148,8 +148,6 @@
string skyframe;
- bool blaze_cpu;
-
// If true, Blaze will listen to OS-level file change notifications.
bool watchfs;
diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 765289c..c484316 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -44,7 +44,6 @@
host_javabase = "";
batch = false;
batch_cpu_scheduling = false;
- blaze_cpu = false;
allow_configurable_attributes = false;
fatal_event_bus_exceptions = false;
io_nice_level = -1;
@@ -81,7 +80,6 @@
lhs->io_nice_level = rhs.io_nice_level;
lhs->max_idle_secs = rhs.max_idle_secs;
lhs->skyframe = rhs.skyframe;
- lhs->blaze_cpu = rhs.blaze_cpu;
lhs->webstatus_port = rhs.webstatus_port;
lhs->watchfs = rhs.watchfs;
lhs->allow_configurable_attributes = rhs.allow_configurable_attributes;
@@ -129,20 +127,14 @@
option_sources["host_jvm_profile"] = rcfile;
} else if ((value = GetUnaryOption(arg, next_arg,
"--host_javabase")) != NULL) {
- // TODO(bazel-team): Consider examining the javabase, and in case of
- // architecture mismatch, treating this option like --blaze_cpu
- // and re-execing.
+ // TODO(bazel-team): Consider examining the javabase and re-execing in case
+ // of architecture mismatch.
host_javabase = MakeAbsolute(value);
option_sources["host_javabase"] = rcfile;
} else if ((value = GetUnaryOption(arg, next_arg, "--host_jvm_args")) !=
NULL) {
host_jvm_args.push_back(value);
option_sources["host_jvm_args"] = rcfile; // NB: This is incorrect
- } else if ((value = GetUnaryOption(arg, next_arg, "--blaze_cpu")) != NULL) {
- blaze_cpu = true;
- option_sources["blaze_cpu"] = rcfile;
- fprintf(stderr, "WARNING: The --blaze_cpu startup option is now ignored "
- "and will be removed in a future release\n");
} else if ((value = GetUnaryOption(arg, next_arg, "--bazelrc")) != NULL) {
if (rcfile != "") {
*error = "Can't specify --bazelrc in the .bazelrc file.";
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 4a7de87..1430935 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
@@ -206,12 +206,6 @@
+ "is not read.")
public boolean masterBlazerc;
- @Option(name = "blaze_cpu",
- defaultValue = "",
- category = "undocumented",
- help = "Unused.")
- public String unusedBlazeCpu;
-
@Option(name = "skyframe",
deprecationWarning = "skyframe is now a no-op and will be removed in an upcoming Blaze "
+ "release",
