diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
2 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java index 8f6d2b5e66..6463077887 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingRuleTransitionFactory.java @@ -20,10 +20,10 @@ import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTr import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleTransitionFactory; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -/** - * A {@link RuleTransitionFactory} that composes other {@link RuleTransitionFactory}s. - */ +/** A {@link RuleTransitionFactory} that composes other {@link RuleTransitionFactory}s. */ +@AutoCodec public class ComposingRuleTransitionFactory implements RuleTransitionFactory { private final RuleTransitionFactory rtf1; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java index c45ec3c66d..e6e6e9c637 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java @@ -556,7 +556,8 @@ public class SkylarkRuleClassFunctions { RuleClassType type = test ? RuleClassType.TEST : RuleClassType.NORMAL; RuleClass parent = test - ? getTestBaseRule(SkylarkUtils.getToolsRepository(funcallEnv), + ? getTestBaseRule( + SkylarkUtils.getToolsRepository(funcallEnv), (PatchTransition) SkylarkUtils.getLipoDataTransition(funcallEnv)) : (executable ? binaryBaseRule : baseRule); @@ -609,7 +610,9 @@ public class SkylarkRuleClassFunctions { .requiresHostConfigurationFragmentsBySkylarkModuleName( hostFragments.getContents(String.class, "host_fragments")); builder.setConfiguredTargetFunction(implementation); - builder.setRuleDefinitionEnvironment(funcallEnv); + builder.setRuleDefinitionEnvironmentLabelAndHashCode( + funcallEnv.getGlobals().getTransitiveLabel(), + funcallEnv.getTransitiveContentHashCode()); builder.addRequiredToolchains(collectToolchainLabels(toolchains, ast)); return new SkylarkRuleFunction(builder, type, attributes, ast.getLocation()); |