Remove --local_resources.

This has been deprecated for a while, and has been removed via --incompatible_remove_local_resources, which defaulted to true in the last major release.

RELNOTES: --local_resources and --incompatible_remove_local_resources have been removed. If you've been setting --local resources or --incompatible_remove_local_resources=false, you must migrate to using --local_ram_resources and --local_cpu_resources instead.
PiperOrigin-RevId: 341852479

Author: susinmotion

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

@@ -196,20 +196,6 @@ public class ExecutionTool {
 
     this.actionContextRegistry = moduleActionContextRegistry;
     this.spawnStrategyRegistry = spawnStrategyRegistry;
-
-    if (options.availableResources != null && options.removeLocalResources) {
-      throw new AbruptExitException(
-          DetailedExitCode.of(
-              FailureDetail.newBuilder()
-                  .setMessage(
-                      "--local_resources is deprecated. Please use --local_ram_resources and/or"
-                          + " --local_cpu_resources")
-                  .setExecutionOptions(
-                      FailureDetails.ExecutionOptions.newBuilder()
-                          .setCode(
-                              FailureDetails.ExecutionOptions.Code.DEPRECATED_LOCAL_RESOURCES_USED))
-                  .build()));
-    }
   }
 
   Executor getExecutor() throws AbruptExitException {
@@ -811,15 +797,7 @@ private Builder createBuilder(
   public static void configureResourceManager(ResourceManager resourceMgr, BuildRequest request) {
     ExecutionOptions options = request.getOptions(ExecutionOptions.class);
     ResourceSet resources;
-    if (options.availableResources != null && !options.removeLocalResources) {
-      logger.atWarning().log(
-          "--local_resources will be deprecated. Please use --local_ram_resources "
-              + "and/or --local_cpu_resources.");
-      resources = options.availableResources;
-    } else {
-      resources =
-          ResourceSet.createWithRamCpu(options.localRamResources, options.localCpuResources);
-    }
+    resources = ResourceSet.createWithRamCpu(options.localRamResources, options.localCpuResources);
     resourceMgr.setUseLocalMemoryEstimate(options.localMemoryEstimate);
 
     resourceMgr.setAvailableResources(

src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java

@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionContext.ShowSubcommands;
 import com.google.devtools.build.lib.actions.LocalHostCapacity;
-import com.google.devtools.build.lib.actions.ResourceSet;
 import com.google.devtools.build.lib.analysis.config.PerLabelOptions;
 import com.google.devtools.build.lib.util.OptionsUtils;
 import com.google.devtools.build.lib.util.RegexFilter;
@@ -31,7 +30,6 @@
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
-import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParsingException;
@@ -293,34 +291,6 @@ public boolean shouldMaterializeParamFiles() {
       help = "This flag has no effect, and is deprecated")
   public boolean useResourceAutoSense;
 
-  @Option(
-      name = "local_resources",
-      defaultValue = "null",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help =
-          "Deprecated by '--incompatible_remove_local_resources'. Please use "
-              + "'--local_ram_resources' and '--local_cpu_resources'",
-      deprecationWarning =
-          "--local_resources is deprecated. Please use"
-              + " --local_ram_resources and --local_cpu_resources instead.",
-      converter = ResourceSet.ResourceSetConverter.class)
-  public ResourceSet availableResources;
-
-  @Option(
-      name = "incompatible_remove_local_resources",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
-      effectTags = {OptionEffectTag.EXECUTION},
-      metadataTags = {
-        OptionMetadataTag.INCOMPATIBLE_CHANGE,
-        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
-      },
-      help =
-          "Deprecate local_resources in favor of --local_ram_resources and "
-              + "--local_cpu_resources.")
-  public boolean removeLocalResources;
-
   @Option(
       name = "local_cpu_resources",
       defaultValue = "HOST_CPUS",