Avoid Skyframe restarts in transitive targets due related to conservative aspect deps.

--
MOS_MIGRATED_REVID=100960261

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
index 7ff71175bd..36d94b96a6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
@@ -154,7 +154,7 @@ public class TransitiveTargetFunction
   }
 
   @Override
-  protected Iterable<SkyKey> getLabelAspectKeys(Target target, Environment env) {
+  protected Iterable<SkyKey> getStrictLabelAspectKeys(Target target, Environment env) {
     List<SkyKey> depKeys = Lists.newArrayList();
     if (target instanceof Rule) {
       Multimap<Attribute, Label> transitions =
@@ -181,6 +181,11 @@ public class TransitiveTargetFunction
     return depKeys;
   }
 
+  @Override
+  protected Iterable<SkyKey> getConservativeLabelAspectKeys(Target target) {
+    return ImmutableSet.of();
+  }
+
   /**
    * Returns every configuration fragment known to the system.
    */