Rollback of commit 2891ec527eed27d0c6460d66f51cb66a43373b6a.

*** Reason for rollback ***

Causes our integration tests on Darwin to time out

*** Original change description ***

Make --watchfs a common command option.

Adding an options parameter to DiffAwareness#getCurrentView seems like the
simplest way to achieve that.

Alternatives considered:
1. Making the diff awareness modules stateful. However, I did not want to do so
as I've also been working on improving the module API to reduce state, or at
least to have a proper lifecycle management for any necessary state.

2. Making the watchFs flag a constructor parameter. However, that would also
invalidate any implement...

***

--
MOS_MIGRATED_REVID=136070807

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index dc67a17f9d..27e2ecc6d6 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -189,7 +189,9 @@ public final class BlazeRuntime {
   public void initWorkspace(BlazeDirectories directories, BinTools binTools)
       throws AbruptExitException {
     Preconditions.checkState(this.workspace == null);
-    WorkspaceBuilder builder = new WorkspaceBuilder(directories, binTools);
+    boolean watchFS = startupOptionsProvider != null
+        && startupOptionsProvider.getOptions(BlazeServerStartupOptions.class).watchFS;
+    WorkspaceBuilder builder = new WorkspaceBuilder(directories, binTools, watchFS);
     for (BlazeModule module : blazeModules) {
       module.workspaceInit(directories, builder);
     }