The great Skylark -> Starlark class migration:
SkylarkConfigurationField
SkylarkConfigurationFieldProcessor
SkylarkAspectClass
AndroidSkylarkCommon
ConfigSkylarkCommon
AndroidSkylarkCommonApi
ConfigSkylarkCommonApi
FakeAndroidSkylarkCommon
FakeConfigSkylarkCommon
SkylarkConfigurationFieldProcessorTest
AndroidSkylarkCommonTest
Attribute.SkylarkRuleAspect
Attribute.SkylarkComputedDefaultTemplate
Attribute.SkylarkComputedDefault
PiperOrigin-RevId: 311216560
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index f590ed4..5e1d4a9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -55,8 +55,8 @@
import com.google.devtools.build.lib.packages.OutputFile;
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.packages.RuleClassProvider;
-import com.google.devtools.build.lib.packages.SkylarkAspectClass;
import com.google.devtools.build.lib.packages.StarlarkAspect;
+import com.google.devtools.build.lib.packages.StarlarkAspectClass;
import com.google.devtools.build.lib.packages.StarlarkDefinedAspect;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.Type.ConversionException;
@@ -125,7 +125,7 @@
*/
@Nullable
static StarlarkDefinedAspect loadStarlarkDefinedAspect(
- Environment env, SkylarkAspectClass starlarkAspectClass)
+ Environment env, StarlarkAspectClass starlarkAspectClass)
throws AspectCreationException, InterruptedException {
Label extensionLabel = starlarkAspectClass.getExtensionLabel();
String starlarkValueName = starlarkAspectClass.getExportedName();
@@ -196,8 +196,8 @@
NativeAspectClass nativeAspectClass = (NativeAspectClass) key.getAspectClass();
aspectFactory = (ConfiguredAspectFactory) nativeAspectClass;
aspect = Aspect.forNative(nativeAspectClass, key.getParameters());
- } else if (key.getAspectClass() instanceof SkylarkAspectClass) {
- SkylarkAspectClass starlarkAspectClass = (SkylarkAspectClass) key.getAspectClass();
+ } else if (key.getAspectClass() instanceof StarlarkAspectClass) {
+ StarlarkAspectClass starlarkAspectClass = (StarlarkAspectClass) key.getAspectClass();
StarlarkDefinedAspect starlarkAspect;
try {
starlarkAspect = loadStarlarkDefinedAspect(env, starlarkAspectClass);
@@ -210,7 +210,7 @@
aspectFactory = new SkylarkAspectFactory(starlarkAspect);
aspect =
- Aspect.forSkylark(
+ Aspect.forStarlark(
starlarkAspect.getAspectClass(),
starlarkAspect.getDefinition(key.getParameters()),
key.getParameters());