Delay BuildView creation in CommandEnvironment until beforeCommand().

This is so that we can access the build options during creation, which is a
step towards making the coverage module stateless.

--
MOS_MIGRATED_REVID=118475354

1 files changed, 9 insertions, 4 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 687e7ae1fb..f0a424c741 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
@@ -81,7 +81,7 @@ public final class CommandEnvironment {
   private final Map<String, String> clientEnv = new HashMap<>();
   private final TimestampGranularityMonitor timestampGranularityMonitor;
 
-  private final BuildView view;
+  private BuildView view;
 
   private PathFragment relativeWorkingDirectory = PathFragment.EMPTY_FRAGMENT;
   private long commandStartTime;
@@ -120,9 +120,6 @@ public final class CommandEnvironment {
     // the command's execution.
     timestampGranularityMonitor.setCommandStartTime();
 
-    this.view = new BuildView(runtime.getDirectories(), runtime.getRuleClassProvider(),
-        runtime.getSkyframeExecutor(), runtime.getCoverageReportActionFactory());
-
     // TODO(ulfjack): We don't call beforeCommand() in tests, but rely on workingDirectory being set
     // in setupPackageCache(). This leads to NPE if we don't set it here.
     this.workingDirectory = runtime.getWorkspace();
@@ -338,6 +335,12 @@ public final class CommandEnvironment {
     return outputFileSystem;
   }
 
+  @VisibleForTesting
+  public void initViewForTesting() {
+    this.view = new BuildView(runtime.getDirectories(), runtime.getRuleClassProvider(),
+        runtime.getSkyframeExecutor(), runtime.getCoverageReportActionFactory());
+  }
+
   /**
    * Hook method called by the BlazeCommandDispatcher prior to the dispatch of
    * each command.
@@ -394,6 +397,8 @@ public final class CommandEnvironment {
         runtime.getStartupOptionsProvider().getOptions(BlazeServerStartupOptions.class).batch,
         optionsParser.getOptions(BuildView.Options.class));
 
+    initViewForTesting();
+
     // Start the performance and memory profilers.
     runtime.beforeCommand(this, options, execStartTimeNanos);