Split apart options that should only be set by the client from CommonCommandOptions.
client_env and default_override stand apart from the other common options. They can be very long, and should only be used by the environment setup. They should ideally not be passed by option at all, but in the RunRequest proto message, but for now, isolate them so that they don't clutter the common command options, which are passed all over the place.
RELNOTES: None.
PiperOrigin-RevId: 173592980
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index cd618d2..9e8bb80 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -40,18 +40,16 @@
BlazeServerStartupOptions.class,
HostJvmStartupOptions.class);
- /**
- * The set of option-classes that are common to all Blaze commands.
- */
+ /** The set of option-classes that are common to all Blaze commands. */
private static final ImmutableList<Class<? extends OptionsBase>> COMMON_COMMAND_OPTIONS =
ImmutableList.of(
BlazeCommandEventHandler.Options.class,
CommonCommandOptions.class,
+ ClientOptions.class,
// Skylark options aren't applicable to all commands, but making them a common option
// allows users to put them in the common section of the bazelrc. See issue #3538.
SkylarkSemanticsOptions.class);
-
private BlazeCommandUtils() {}
public static ImmutableList<Class<? extends OptionsBase>> getStartupOptions(
