commit 7b3a3fd995608b1f18c3776a60c5b645f4e31393
author shahan <shahan@google.com> Mon Jul 30 05:50:49 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Jul 30 05:51:59 2018 -0700
tree 8c6b4d37ecdf5a3bc60250bf0f8eebd65e4f613c
parent 56b12012028f9ec1378c5203918e20bd5b4fe044

Allows subclasses of SkyframeExecutor to enable analysis during execution.

PiperOrigin-RevId: 206568465

src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 60a22fb..3bb767f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -588,8 +588,11 @@
       ImmutableMap<Label, ConfigMatchingProvider> configConditions,
       @Nullable ToolchainContext toolchainContext)
       throws InterruptedException, ActionConflictException {
-    Preconditions.checkState(enableAnalysis,
-        "Already in execution phase %s %s", target, configuration);
+    Preconditions.checkState(
+        enableAnalysis || skyframeExecutor.allowsAnalysisDuringExecution(),
+        "Already in execution phase %s %s",
+        target,
+        configuration);
     Preconditions.checkNotNull(analysisEnvironment);
     Preconditions.checkNotNull(target);
     Preconditions.checkNotNull(prerequisiteMap);

src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 80ad0b3..c666c4c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -2324,4 +2324,8 @@
     modifiedFilesDuringPreviousBuild = 0;
     return result;
   }
+
+  protected boolean allowsAnalysisDuringExecution() {
+    return false;
+  }
 }