Remove no-op + deprecated flags from RemoteOptions that have been no-…

…op for more than a year.

PiperOrigin-RevId: 642240478
Change-Id: I6ba85bb8e74491bdd6cee86d020ebc2102ab31bb

src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java

@@ -260,7 +260,7 @@ public final class RemoteOptions extends CommonRemoteOptions {
       defaultValue = "local",
       documentationCategory = OptionDocumentationCategory.REMOTE,
       effectTags = {OptionEffectTag.UNKNOWN},
-      help = "No-op, deprecated. See https://github.com/bazelbuild/bazel/issues/7480 for details.")
+      help = "Deprecated. See https://github.com/bazelbuild/bazel/issues/7480 for details.")
   public String remoteLocalFallbackStrategy;
 
   @Option(
@@ -273,18 +273,6 @@ public final class RemoteOptions extends CommonRemoteOptions {
               + "cache supports it and the user is authorized to do so.")
   public boolean remoteUploadLocalResults;
 
-  @Deprecated
-  @Option(
-      name = "incompatible_remote_build_event_upload_respect_no_cache",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.REMOTE,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      deprecationWarning =
-          "--incompatible_remote_build_event_upload_respect_no_cache has been deprecated in favor"
-              + " of --remote_build_event_upload=minimal.",
-      help = "Deprecated. No-op. Use --remote_build_event_upload=minimal instead.")
-  public boolean incompatibleRemoteBuildEventUploadRespectNoCache;
-
   @Option(
       name = "remote_build_event_upload",
       oldName = "experimental_remote_build_event_upload",
@@ -309,16 +297,6 @@ public RemoteBuildEventUploadModeConverter() {
     }
   }
 
-  @Option(
-      name = "incompatible_remote_results_ignore_disk",
-      defaultValue = "true",
-      category = "remote",
-      documentationCategory = OptionDocumentationCategory.REMOTE,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-      help = "No-op")
-  public boolean incompatibleRemoteResultsIgnoreDisk;
-
   @Option(
       name = "incompatible_remote_output_paths_relative_to_input_root",
       defaultValue = "false",