commit c7b449118522cd586a33a13265e90a489ece306e
author leba <leba@google.com> Tue Mar 29 05:16:33 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 29 05:17:44 2022 -0700
tree 11e71f8da86b932fed5ebcadd090823bf845aac4
parent db36147bc66109cc2f34bcdb5bb8829182ef0346

Update the sets of built targets and aspects in the ExecutionProgressReceiver with Skymeld & incremental builds.

PiperOrigin-RevId: 437997802

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
index 94ef0c1..ece15d6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverKey.java
@@ -29,26 +29,48 @@
   private final TestType testType;
   private final boolean strictActionConflictCheck;
 
-  public BuildDriverKey(
-      ActionLookupKey actionLookupKey,
-      TopLevelArtifactContext topLevelArtifactContext,
-      boolean strictActionConflictCheck) {
-    this(
-        actionLookupKey,
-        topLevelArtifactContext,
-        strictActionConflictCheck,
-        /*testType=*/ TestType.NOT_TEST);
+  public boolean isTopLevelAspectDriver() {
+    return isTopLevelAspectDriver;
   }
 
-  public BuildDriverKey(
+  private final boolean isTopLevelAspectDriver;
+
+  private BuildDriverKey(
       ActionLookupKey actionLookupKey,
       TopLevelArtifactContext topLevelArtifactContext,
       boolean strictActionConflictCheck,
-      TestType testType) {
+      TestType testType,
+      boolean isTopLevelAspectDriver) {
     this.actionLookupKey = actionLookupKey;
     this.topLevelArtifactContext = topLevelArtifactContext;
     this.strictActionConflictCheck = strictActionConflictCheck;
     this.testType = testType;
+    this.isTopLevelAspectDriver = isTopLevelAspectDriver;
+  }
+
+  public static BuildDriverKey ofTopLevelAspect(
+      ActionLookupKey actionLookupKey,
+      TopLevelArtifactContext topLevelArtifactContext,
+      boolean strictActionConflictCheck) {
+    return new BuildDriverKey(
+        actionLookupKey,
+        topLevelArtifactContext,
+        strictActionConflictCheck,
+        TestType.NOT_TEST,
+        /*isTopLevelAspectDriver=*/ true);
+  }
+
+  public static BuildDriverKey ofConfiguredTarget(
+      ActionLookupKey actionLookupKey,
+      TopLevelArtifactContext topLevelArtifactContext,
+      boolean strictActionConflictCheck,
+      TestType testType) {
+    return new BuildDriverKey(
+        actionLookupKey,
+        topLevelArtifactContext,
+        strictActionConflictCheck,
+        testType,
+        /*isTopLevelAspectDriver=*/ false);
   }
 
   public TopLevelArtifactContext getTopLevelArtifactContext() {