Remove TransitionMode from RuleContext prerequisite calls.

Part of removing TransitionMode entirely. PiperOrigin-RevId: 329741153
bazelbuild · Sep 2, 2020 · 80bfa26 · 80bfa26
1 parent 8a227ad
commit 80bfa26
Show file tree

Hide file tree

Showing 31 changed files with 146 additions and 267 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
-import com.google.devtools.build.lib.analysis.TransitionMode;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
@@ -79,7 +78,7 @@ public ConfiguredTarget create(RuleContext ruleContext)
     AndroidSdkProvider.verifyPresence(ruleContext);
 
     RuleConfiguredTargetBuilder ruleBuilder = new RuleConfiguredTargetBuilder(ruleContext);
-    Artifact aar = ruleContext.getPrerequisiteArtifact("aar", TransitionMode.TARGET);
+    Artifact aar = ruleContext.getPrerequisiteArtifact("aar");
 
     Artifact allAarJars = createAarTreeArtifact(ruleContext, "jars");
     Artifact jarMergingParams = createAarArtifact(ruleContext, "jar_merging_params");
@@ -140,8 +139,8 @@ public ConfiguredTarget create(RuleContext ruleContext)
 
     ImmutableList<TransitiveInfoCollection> targets =
         ImmutableList.<TransitiveInfoCollection>builder()
-            .addAll(ruleContext.getPrerequisites("exports", TransitionMode.TARGET))
-            .addAll(ruleContext.getPrerequisites("deps", TransitionMode.TARGET))
+            .addAll(ruleContext.getPrerequisites("exports"))
+            .addAll(ruleContext.getPrerequisites("deps"))
             .build();
     JavaCommon common =
         new JavaCommon(
@@ -198,16 +197,15 @@ public ConfiguredTarget create(RuleContext ruleContext)
 
     // Wire up the source jar for the current target and transitive source jars from dependencies.
     ImmutableList<Artifact> srcJars = ImmutableList.of();
-    Artifact srcJar = ruleContext.getPrerequisiteArtifact("srcjar", TransitionMode.TARGET);
+    Artifact srcJar = ruleContext.getPrerequisiteArtifact("srcjar");
     NestedSetBuilder<Artifact> transitiveJavaSourceJarBuilder = NestedSetBuilder.stableOrder();
     if (srcJar != null) {
       srcJars = ImmutableList.of(srcJar);
       transitiveJavaSourceJarBuilder.add(srcJar);
     }
     for (JavaSourceJarsProvider other :
         JavaInfo.getProvidersFromListOfTargets(
-            JavaSourceJarsProvider.class,
-            ruleContext.getPrerequisites("exports", TransitionMode.TARGET))) {
+            JavaSourceJarsProvider.class, ruleContext.getPrerequisites("exports"))) {
       transitiveJavaSourceJarBuilder.addTransitive(other.getTransitiveSourceJars());
     }
     NestedSet<Artifact> transitiveJavaSourceJars = transitiveJavaSourceJarBuilder.build();
@@ -269,7 +267,7 @@ private NestedSet<Artifact> getBootclasspath(RuleContext ruleContext) {
       return NestedSetBuilder.<Artifact>stableOrder()
           .addTransitive(
               ruleContext
-                  .getPrerequisite("$desugar_java8_extra_bootclasspath", TransitionMode.HOST)
+                  .getPrerequisite("$desugar_java8_extra_bootclasspath")
                   .getProvider(FileProvider.class)
                   .getFilesToBuild())
           .add(AndroidSdkProvider.fromRuleContext(ruleContext).getAndroidJar())
@@ -297,9 +295,7 @@ private static Action[] createSingleFileExtractorActions(
     SpawnAction.Builder builder =
         new SpawnAction.Builder()
             .useDefaultShellEnvironment()
-            .setExecutable(
-                ruleContext.getExecutablePrerequisite(
-                    AarImportBaseRule.ZIPPER, TransitionMode.HOST))
+            .setExecutable(ruleContext.getExecutablePrerequisite(AarImportBaseRule.ZIPPER))
             .setMnemonic("AarFileExtractor")
             .setProgressMessage("Extracting %s from %s", filename, aar.getFilename())
             .addInput(aar)
@@ -327,8 +323,7 @@ private static Action[] createAarResourcesExtractorActions(
     return new SpawnAction.Builder()
         .useDefaultShellEnvironment()
         .setExecutable(
-            ruleContext.getExecutablePrerequisite(
-                AarImportBaseRule.AAR_RESOURCES_EXTRACTOR, TransitionMode.HOST))
+            ruleContext.getExecutablePrerequisite(AarImportBaseRule.AAR_RESOURCES_EXTRACTOR))
         .setMnemonic("AarResourcesExtractor")
         .addInput(aar)
         .addOutput(resourcesDir)
@@ -354,8 +349,7 @@ private static Action[] createAarEmbeddedJarsExtractorActions(
     return new SpawnAction.Builder()
         .useDefaultShellEnvironment()
         .setExecutable(
-            ruleContext.getExecutablePrerequisite(
-                AarImportBaseRule.AAR_EMBEDDED_JARS_EXTACTOR, TransitionMode.HOST))
+            ruleContext.getExecutablePrerequisite(AarImportBaseRule.AAR_EMBEDDED_JARS_EXTACTOR))
         .setMnemonic("AarEmbeddedJarsExtractor")
         .setProgressMessage("Extracting classes.jar and libs/*.jar from %s", aar.getFilename())
         .addInput(aar)
@@ -395,7 +389,7 @@ private static Action[] createAarNativeLibsFilterActions(
             .useDefaultShellEnvironment()
             .setExecutable(
                 ruleContext.getExecutablePrerequisite(
-                    AarImportBaseRule.AAR_NATIVE_LIBS_ZIP_CREATOR, TransitionMode.HOST))
+                    AarImportBaseRule.AAR_NATIVE_LIBS_ZIP_CREATOR))
             .setMnemonic("AarNativeLibsFilter")
             .setProgressMessage("Filtering AAR native libs by architecture")
             .addInput(aar)
@@ -415,11 +409,10 @@ private static DataBindingV2Provider createDatabindingProvider(
       SpecialArtifact databindingSetterStoreFiles) {
 
     Iterable<? extends DataBindingV2ProviderApi<Artifact>> databindingProvidersFromDeps =
-        ruleContext.getPrerequisites("deps", TransitionMode.TARGET, DataBindingV2Provider.PROVIDER);
+        ruleContext.getPrerequisites("deps", DataBindingV2Provider.PROVIDER);
 
     Iterable<? extends DataBindingV2ProviderApi<Artifact>> databindingProvidersFromExports =
-        ruleContext.getPrerequisites(
-            "exports", TransitionMode.TARGET, DataBindingV2Provider.PROVIDER);
+        ruleContext.getPrerequisites("exports", DataBindingV2Provider.PROVIDER);
 
     DataBindingV2Provider dataBindingV2Provider =
         DataBindingV2Provider.createProvider(

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java
@@ -21,7 +21,6 @@
 import com.google.devtools.build.lib.analysis.FileProvider;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RuleErrorConsumer;
-import com.google.devtools.build.lib.analysis.TransitionMode;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.packages.Type;
@@ -110,7 +109,7 @@ private static Iterable<? extends TransitiveInfoCollection> getAssetTargets(
       return null;
     }
 
-    return ruleContext.getPrerequisitesIf(ASSETS_ATTR, TransitionMode.TARGET, FileProvider.class);
+    return ruleContext.getPrerequisitesIf(ASSETS_ATTR, FileProvider.class);
   }
 
   @Nullable