fix forward for bazelbuild@ceddfb1. Make sure the use the appropriate…

… check for alias + feature flag so trimming does not get applied PiperOrigin-RevId: 563185304 Change-Id: I6f1d3f0fb1a5c85c980faa196832f094ac4c9666
uber-common · Sep 6, 2023 · 4fb701a · 4fb701a
1 parent ffa81f1
commit 4fb701a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...java/com/google/devtools/build/lib/analysis/producers/TargetAndConfigurationProducer.java b/...java/com/google/devtools/build/lib/analysis/producers/TargetAndConfigurationProducer.java
@@ -466,9 +466,7 @@ public StateMachine computeTransition(Tasks tasks) {
         transition = transitionFactory.create(transitionData);
       }
 
-      boolean isAlias = target.getAssociatedRule().getName().equals("alias");
-
-      if (trimmingTransitionFactory != null && !isAlias) {
+      if (trimmingTransitionFactory != null) {
         var trimmingTransition = trimmingTransitionFactory.create(transitionData);
         if (transition != null) {
           transition = ComposingTransition.of(transition, trimmingTransition);

diff --git a/...gle/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java b/...gle/devtools/build/lib/rules/config/ConfigFeatureFlagTaggedTrimmingTransitionFactory.java
@@ -20,10 +20,12 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
+import com.google.devtools.build.lib.analysis.AliasProvider;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.BuildOptionsView;
 import com.google.devtools.build.lib.analysis.config.CoreOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
+import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -94,6 +96,12 @@ public ConfigFeatureFlagTaggedTrimmingTransitionFactory(String attributeName) {
   public PatchTransition create(RuleTransitionData ruleData) {
     NonconfiguredAttributeMapper attrs = NonconfiguredAttributeMapper.of(ruleData.rule());
     RuleClass ruleClass = ruleData.rule().getRuleClassObject();
+
+    if (AliasProvider.mayBeAlias(ruleData.rule())) {
+      // As a convenience, do not require transitive_config to be set for alias rule.
+      return NoTransition.INSTANCE;
+    }
+
     if (ruleClass.getName().equals(ConfigRuleClasses.ConfigFeatureFlagRule.RULE_NAME)) {
       return new ConfigFeatureFlagTaggedTrimmingTransition(
           ImmutableSortedSet.of(ruleData.rule().getLabel()));