Remove option --experimental_preserve_spaces_in_host_jvm_args. Its work as a shim is done, and Blaze now always preserves spaces in host_jvm_args.

--
MOS_MIGRATED_REVID=111523524

4 files changed, 3 insertions, 45 deletions

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 8373911321..0651351ff6 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -261,25 +261,9 @@ static vector<string> GetArgumentArray() {
 
   vector<string> user_options;
 
-  if (globals->options.preserve_spaces_in_host_jvm_args) {
-    user_options.insert(user_options.begin(),
-                        globals->options.host_jvm_args.begin(),
-                        globals->options.host_jvm_args.end());
-  } else {
-    for (const auto &arg : globals->options.host_jvm_args) {
-      int num_segments =
-          blaze_util::SplitQuotedStringUsing(arg, ' ', &user_options);
-      if (num_segments > 1) {
-        fprintf(
-            stderr,
-            "WARNING: You are passing multiple jvm options"
-            " under a single --host_jvm_args option: %s. This will stop working"
-            "soon. Instead, pass each option under its own -host_jvm_args "
-            "option.\n",
-            arg.c_str());
-      }
-    }
-  }
+  user_options.insert(user_options.begin(),
+                      globals->options.host_jvm_args.begin(),
+                      globals->options.host_jvm_args.end());
 
   // Add JVM arguments particular to building blaze64 and particular JVM
   // versions.
@@ -372,9 +356,6 @@ static vector<string> GetArgumentArray() {
   if (!globals->options.host_jvm_profile.empty()) {
     result.push_back("--host_jvm_profile=" + globals->options.host_jvm_profile);
   }
-  if (globals->options.preserve_spaces_in_host_jvm_args) {
-    result.push_back("--experimental_preserve_spaces_in_host_jvm_args");
-  }
   if (!globals->options.host_jvm_args.empty()) {
     for (const auto &arg : globals->options.host_jvm_args) {
       result.push_back("--host_jvm_args=" + arg);
diff --git a/src/main/cpp/blaze_startup_options.h b/src/main/cpp/blaze_startup_options.h
index d382ffa54c..f635db4c09 100644
--- a/src/main/cpp/blaze_startup_options.h
+++ b/src/main/cpp/blaze_startup_options.h
@@ -130,8 +130,6 @@ class BlazeStartupOptions {
 
   string host_jvm_profile;
 
-  bool preserve_spaces_in_host_jvm_args;
-
   std::vector<string> host_jvm_args;
 
   bool batch;
diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 2cbab033ec..765289c0b7 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -42,8 +42,6 @@ void BlazeStartupOptions::Init() {
   block_for_lock = true;
   host_jvm_debug = false;
   host_javabase = "";
-  // TODO(janakr): delete this.
-  preserve_spaces_in_host_jvm_args = true;
   batch = false;
   batch_cpu_scheduling = false;
   blaze_cpu = false;
@@ -77,7 +75,6 @@ void BlazeStartupOptions::Copy(
   lhs->host_jvm_debug = rhs.host_jvm_debug;
   lhs->host_jvm_profile = rhs.host_jvm_profile;
   lhs->host_javabase = rhs.host_javabase;
-  lhs->preserve_spaces_in_host_jvm_args = rhs.preserve_spaces_in_host_jvm_args;
   lhs->host_jvm_args = rhs.host_jvm_args;
   lhs->batch = rhs.batch;
   lhs->batch_cpu_scheduling = rhs.batch_cpu_scheduling;
@@ -137,14 +134,6 @@ blaze_exit_code::ExitCode BlazeStartupOptions::ProcessArg(
     // and re-execing.
     host_javabase = MakeAbsolute(value);
     option_sources["host_javabase"] = rcfile;
-  } else if (GetNullaryOption(
-                 arg, "--experimental_preserve_spaces_in_host_jvm_args")) {
-    preserve_spaces_in_host_jvm_args = true;
-    option_sources["preserve_spaces_in_host_jvm_args"] = rcfile;
-  } else if (GetNullaryOption(
-                 arg, "--noexperimental_preserve_spaces_in_host_jvm_args")) {
-    preserve_spaces_in_host_jvm_args = false;
-    option_sources["preserve_spaces_in_host_jvm_args"] = rcfile;
   } else if ((value = GetUnaryOption(arg, next_arg, "--host_jvm_args")) !=
              NULL) {
     host_jvm_args.push_back(value);
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 e37fdae34a..8f66df6ac1 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
@@ -220,16 +220,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
       help = "Unused.")
   public String unusedSkyframe;
 
-  @Option(
-    name = "experimental_preserve_spaces_in_host_jvm_args",
-    defaultValue = "false",
-    category = "undocumented",
-    help =
-        "If this option is true, each argument to --host_jvm_args is considered a single JVM "
-            + "flag, even if it has spaces in it."
-  )
-  public boolean unusedPreserveSpacesInHostJvmArgs;
-
   @Option(name = "fatal_event_bus_exceptions",
       defaultValue = "false",  // NOTE: purely decorative!
       category = "undocumented",