Optionally allow Bazel to pass JVM options containing spaces directly through to the JVM instead of (almost certainly incorrectly) splitting the options along spaces.

This allows us to pass non-quote-delimited strings to the JVM, which is necessary for things like -XX:OnOutOfMemoryError="kill -3 %p" (normally bash strips those quotes, but they're not stripped when passed via --host_jvm_args).

--
MOS_MIGRATED_REVID=107820087

1 files changed, 10 insertions, 0 deletions

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 69d69da39d..2621a53035 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
@@ -213,6 +213,16 @@ 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",