diff options
author | 2018-03-27 10:40:26 -0700 | |
---|---|---|
committer | 2018-03-27 10:42:10 -0700 | |
commit | a7b2f297b04d4638ff9d5b0cd921dd6a668e5d5e (patch) | |
tree | 5588882aa4d36761468a2ea89dfdc7add0f6dd59 /src | |
parent | 60554e40665c44e0f0423eb43183db3ea7c69514 (diff) |
Remove the --allow_configurable_attributes startup option.
It was removed from the java code 4 years ago, mentioning it causes the server to crash at startup.
RELNOTES: None.
PiperOrigin-RevId: 190636455
Diffstat (limited to 'src')
-rw-r--r-- | src/main/cpp/blaze.cc | 3 | ||||
-rw-r--r-- | src/main/cpp/startup_options.cc | 8 | ||||
-rw-r--r-- | src/main/cpp/startup_options.h | 5 | ||||
-rw-r--r-- | src/test/cpp/startup_options_test.cc | 1 |
4 files changed, 0 insertions, 17 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index be52c2f953..2a125381b1 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -508,9 +508,6 @@ static vector<string> GetArgumentArray( result.push_back("--server_jvm_out=" + globals->options->server_jvm_out); } - if (globals->options->allow_configurable_attributes) { - result.push_back("--allow_configurable_attributes"); - } if (globals->options->deep_execroot) { result.push_back("--deep_execroot"); } else { diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc index 0ff6d13e32..49c18a3c26 100644 --- a/src/main/cpp/startup_options.cc +++ b/src/main/cpp/startup_options.cc @@ -83,7 +83,6 @@ StartupOptions::StartupOptions(const string &product_name, oom_more_eagerly_threshold(100), write_command_log(true), watchfs(false), - allow_configurable_attributes(false), fatal_event_bus_exceptions(false), command_port(0), connect_timeout_secs(30), @@ -122,7 +121,6 @@ StartupOptions::StartupOptions(const string &product_name, // IMPORTANT: Before modifying the statements below please contact a Bazel // core team member that knows the internal procedure for adding/deprecating // startup flags. - RegisterNullaryStartupFlag("allow_configurable_attributes"); RegisterNullaryStartupFlag("batch"); RegisterNullaryStartupFlag("batch_cpu_scheduling"); RegisterNullaryStartupFlag("block_for_lock"); @@ -268,12 +266,6 @@ blaze_exit_code::ExitCode StartupOptions::ProcessArg( } else if (GetNullaryOption(arg, "--nobatch_cpu_scheduling")) { batch_cpu_scheduling = false; option_sources["batch_cpu_scheduling"] = rcfile; - } else if (GetNullaryOption(arg, "--allow_configurable_attributes")) { - allow_configurable_attributes = true; - option_sources["allow_configurable_attributes"] = rcfile; - } else if (GetNullaryOption(arg, "--noallow_configurable_attributes")) { - allow_configurable_attributes = false; - option_sources["allow_configurable_attributes"] = rcfile; } else if (GetNullaryOption(arg, "--fatal_event_bus_exceptions")) { fatal_event_bus_exceptions = true; option_sources["fatal_event_bus_exceptions"] = rcfile; diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h index 327d2d91ca..4dc289a66d 100644 --- a/src/main/cpp/startup_options.h +++ b/src/main/cpp/startup_options.h @@ -250,11 +250,6 @@ class StartupOptions { // If true, Blaze will listen to OS-level file change notifications. bool watchfs; - // Temporary experimental flag that permits configurable attribute syntax - // in BUILD files. This will be removed when configurable attributes is - // a more stable feature. - bool allow_configurable_attributes; - // Temporary flag for enabling EventBus exceptions to be fatal. bool fatal_event_bus_exceptions; diff --git a/src/test/cpp/startup_options_test.cc b/src/test/cpp/startup_options_test.cc index d52ee3b597..9090a64e0f 100644 --- a/src/test/cpp/startup_options_test.cc +++ b/src/test/cpp/startup_options_test.cc @@ -126,7 +126,6 @@ TEST_F(StartupOptionsTest, ValidStartupFlagsTest) { // IMPORTANT: Before modifying this test, please contact a Bazel core team // member that knows the Google-internal procedure for adding/deprecating // startup flags. - SuccessfulIsNullaryTest("allow_configurable_attributes"); SuccessfulIsNullaryTest("batch"); SuccessfulIsNullaryTest("batch_cpu_scheduling"); SuccessfulIsNullaryTest("block_for_lock"); |