Add StarlarkContext to Environment created in SkylarkAspectFactory.
RELNOTES: None
PiperOrigin-RevId: 228779167
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
index cb4662a..b2ab9aa 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectDefinitionTest.java
@@ -60,7 +60,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext context, AspectParameters parameters) {
+ ConfiguredTargetAndData ctadBase,
+ RuleContext context,
+ AspectParameters parameters,
+ String toolsRepository) {
throw new IllegalStateException();
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 954ac20..b0f440a 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -437,7 +437,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws InterruptedException, ActionConflictException {
Object lateBoundPrereq = ruleContext.getPrerequisite(":late", TARGET);
return new ConfiguredAspect.Builder(this, parameters, ruleContext)
@@ -507,7 +510,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws InterruptedException, ActionConflictException {
ruleContext.registerAction(new NullAction(ruleContext.createOutputArtifact()));
return new ConfiguredAspect.Builder(this, parameters, ruleContext).build();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index d5fe190..c656730 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -229,7 +229,10 @@
implements ConfiguredAspectFactory {
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws ActionConflictException {
String information = parameters.isEmpty()
? ""
@@ -276,7 +279,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws ActionConflictException {
return new ConfiguredAspect.Builder(this, parameters, ruleContext)
.addProvider(new FooProvider())
@@ -296,7 +302,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws ActionConflictException {
return new ConfiguredAspect.Builder(this, parameters, ruleContext)
.addProvider(new BarProvider())
@@ -434,7 +443,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws ActionConflictException {
StringBuilder information = new StringBuilder("aspect " + ruleContext.getLabel());
if (!parameters.isEmpty()) {
@@ -482,7 +494,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository)
throws ActionConflictException {
ruleContext.ruleWarning("Aspect warning on " + ctadBase.getTarget().getLabel());
return new ConfiguredAspect.Builder(this, parameters, ruleContext).build();
@@ -508,7 +523,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters) {
+ ConfiguredTargetAndData ctadBase,
+ RuleContext ruleContext,
+ AspectParameters parameters,
+ String toolsRepository) {
ruleContext.ruleError("Aspect error");
return null;
}
@@ -538,7 +556,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext context, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext context,
+ AspectParameters parameters,
+ String toolsRepository)
throws InterruptedException, ActionConflictException {
return new ConfiguredAspect.Builder(this, parameters, context).build();
}
@@ -784,7 +805,10 @@
@Override
public ConfiguredAspect create(
- ConfiguredTargetAndData ctadBase, RuleContext context, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase,
+ RuleContext context,
+ AspectParameters parameters,
+ String toolsRepository)
throws InterruptedException, ActionConflictException {
return ConfiguredAspect.builder(this, parameters, context)
.addProvider(Provider.class, new Provider(ctadBase.getConfiguredTarget().getLabel()))
