Deprecate flags --experimental_require_availability_info and --experimental_availability_info_exempt.

PiperOrigin-RevId: 530301817
Change-Id: I1efb1bbcb2239e2faea14fe12451cd20688c29a5

Author: larsrc-google

src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD

@@ -37,7 +37,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:actions/file_write_action_context",
         "//src/main/java/com/google/devtools/build/lib/analysis:actions/template_expansion_action",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
-        "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
         "//src/main/java/com/google/devtools/build/lib/analysis:common_prerequisite_validator",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/build_configuration",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/build_options",

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java

@@ -33,6 +33,7 @@
 import com.google.devtools.build.lib.util.AbruptExitException;
 import com.google.devtools.build.lib.util.DetailedExitCode;
 import com.google.devtools.build.lib.util.ResourceFileLoader;
+import com.google.devtools.common.options.Converters;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
@@ -341,6 +342,25 @@ public static class BuildGraveyardOptions extends OptionsBase {
         metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
         help = "This option is deprecated and has no effect.")
     public boolean autoConfigureHostPlatform;
+
+    @Deprecated
+    @Option(
+        name = "experimental_require_availability_info",
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        effectTags = {OptionEffectTag.UNKNOWN},
+        defaultValue = "false",
+        help = "Deprecated no-op.")
+    public boolean requireAvailabilityInfo;
+
+    @Deprecated
+    @Option(
+        name = "experimental_availability_info_exempt",
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        effectTags = {OptionEffectTag.UNKNOWN},
+        defaultValue = "Genrule,TestRunner",
+        converter = Converters.CommaSeparatedOptionListConverter.class,
+        help = "Deprecated no-op.")
+    public List<String> availabilityInfoExempt;
   }
 
   /** This is where deprecated Bazel-specific options only used by the build command go to die. */

src/main/java/com/google/devtools/build/lib/dynamic/DynamicExecutionOptions.java

@@ -119,28 +119,6 @@ public class DynamicExecutionOptions extends OptionsBase {
       defaultValue = "false")
   public boolean debugSpawnScheduler;
 
-  @Option(
-      name = "experimental_require_availability_info",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      defaultValue = "false",
-      help =
-          "If true, fail the build if there are actions that set requires-darwin but do not have"
-              + "Xcode availability-related execution requirements set.")
-  public boolean requireAvailabilityInfo;
-
-  @Option(
-      name = "experimental_availability_info_exempt",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      defaultValue = "Genrule,TestRunner",
-      converter = Converters.CommaSeparatedOptionListConverter.class,
-      help =
-          "A comma-separated list of mnemonics that are not required to have Xcode-related "
-              + "execution info if --experimental_require_availability_info=true. No-op if "
-              + "--experimental_require_availability_info=false.")
-  public List<String> availabilityInfoExempt;
-
   @Option(
       name = "experimental_dynamic_slow_remote_time",
       documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,

src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java

@@ -29,9 +29,7 @@
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.DynamicStrategyRegistry;
 import com.google.devtools.build.lib.actions.DynamicStrategyRegistry.DynamicMode;
-import com.google.devtools.build.lib.actions.EnvironmentalExecException;
 import com.google.devtools.build.lib.actions.ExecException;
-import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.actions.SandboxedSpawnStrategy;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnResult;
@@ -191,7 +189,6 @@ private static boolean canExecRemote(
   public ImmutableList<SpawnResult> exec(
       final Spawn spawn, final ActionExecutionContext actionExecutionContext)
       throws ExecException, InterruptedException {
-    DynamicSpawnStrategy.verifyAvailabilityInfo(options, spawn);
     ImmutableList<SpawnResult> nonDynamicResults =
         maybeExecuteNonDynamically(spawn, actionExecutionContext);
     if (nonDynamicResults != null) {
@@ -270,47 +267,6 @@ private void tryScheduleLocalJob() {
     }
   }
 
-  /**
-   * Checks if the given spawn has the right execution requirements to indicate whether it can
-   * succeed when running remotely and/or locally depending on the Xcode versions it needs.
-   *
-   * @param options the dynamic execution options that configure this check
-   * @param spawn the spawn to validate
-   * @throws ExecException if the spawn does not contain the expected execution requirements
-   */
-  static void verifyAvailabilityInfo(DynamicExecutionOptions options, Spawn spawn)
-      throws ExecException {
-    if (options.requireAvailabilityInfo
-        && !options.availabilityInfoExempt.contains(spawn.getMnemonic())) {
-      if (spawn.getExecutionInfo().containsKey(ExecutionRequirements.REQUIRES_DARWIN)
-          && !spawn.getExecutionInfo().containsKey(ExecutionRequirements.REQUIREMENTS_SET)) {
-        String message =
-            String.format(
-                "The following spawn was missing Xcode-related execution requirements. Please"
-                    + " let the Bazel team know if you encounter this issue. You can work around"
-                    + " this error by passing --experimental_require_availability_info=false --"
-                    + " at your own risk! This may cause some actions to be executed on the"
-                    + " wrong platform, which can result in build failures.\n"
-                    + "Failing spawn: mnemonic = %s\n"
-                    + "tool files = %s\n"
-                    + "execution platform = %s\n"
-                    + "execution info = %s\n",
-                spawn.getMnemonic(),
-                spawn.getToolFiles(),
-                spawn.getExecutionPlatform(),
-                spawn.getExecutionInfo());
-
-        FailureDetail detail =
-            FailureDetail.newBuilder()
-                .setMessage(message)
-                .setDynamicExecution(
-                    DynamicExecution.newBuilder().setCode(Code.XCODE_RELATED_PREREQ_UNMET))
-                .build();
-        throw new EnvironmentalExecException(detail);
-      }
-    }
-  }
-
   /**
    * Checks if this action should be executed dynamically, and if not executes it locally or
    * remotely as applicable, or throws an exception if it cannot be executed at all.