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

1 files changed, 3 insertions, 22 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);