Move getOutputFilesystem to CommandEnvironment; refactor BlazeRuntime commands.

This change makes it so commands are no longer both stored in the BlazeRuntime
and in the BlazeCommandDispatcher. Instead, they are only stored in
BlazeRuntime and usually passed there during construction. We have some tests
where this is tricky, so I'm keeping the old code path for now.

--
MOS_MIGRATED_REVID=103364581

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 7641ec9d33..5590b061c8 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -61,6 +61,8 @@ public final class CommandEnvironment {
   private final BlazeModule.ModuleEnvironment blazeModuleEnvironment;
   private final Map<String, String> clientEnv = new HashMap<>();
 
+  private String outputFileSystem;
+
   private AtomicReference<AbruptExitException> pendingException = new AtomicReference<>();
 
   private class BlazeModuleEnvironment implements BlazeModule.ModuleEnvironment {
@@ -222,4 +224,12 @@ public final class CommandEnvironment {
   public long getCommandStartTime() {
     return runtime.getCommandStartTime();
   }
+
+  void setOutputFileSystem(String outputFileSystem) {
+    this.outputFileSystem = outputFileSystem;
+  }
+
+  public String getOutputFileSystem() {
+    return outputFileSystem;
+  }
 }