Move deprecated fileset options to the graveyard.

PiperOrigin-RevId: 545641304 Change-Id: I21d5846e06e6f45b55b0ab883ad5ad7e8f76a846
Kila2 · Sep 5, 2023 · ecb10d5 · ecb10d5
1 parent 03614a8
commit ecb10d5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -173,8 +173,7 @@ public class CoreOptions extends FragmentOptions implements Cloneable {
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT},
       help =
           "If this option is enabled, filesets crossing package boundaries are reported "
-              + "as errors. It does not work when check_fileset_dependencies_recursively is "
-              + "disabled.")
+              + "as errors.")
   public boolean strictFilesets;
 
   @Option(
@@ -499,14 +498,6 @@ public ExecConfigurationDistinguisherSchemeConverter() {
               + "https://bazel.build/extending/rules#runfiles_features_to_avoid).")
   public boolean alwaysIncludeFilesToBuildInData;
 
-  @Option(
-      name = "experimental_skyframe_native_filesets",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
-      deprecationWarning = "This flag is a no-op and skyframe-native-filesets is always true.")
-  public boolean skyframeNativeFileset;
-
   @Option(
       name = "run_under",
       defaultValue = "null",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
@@ -467,6 +467,16 @@ public static class BuildGraveyardOptions extends OptionsBase {
         help = "This option is deprecated and has no effect and will be removed in the future.")
     public boolean deferParamFiles;
 
+    @Option(
+        name = "experimental_throttle_action_cache_check",
+        defaultValue = "true",
+        converter = BooleanConverter.class,
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        metadataTags = OptionMetadataTag.EXPERIMENTAL,
+        effectTags = {OptionEffectTag.EXECUTION},
+        help = "no-op")
+    public boolean throttleActionCacheCheck;
+
     @Option(
         name = "check_fileset_dependencies_recursively",
         defaultValue = "true",
@@ -478,14 +488,12 @@ public static class BuildGraveyardOptions extends OptionsBase {
     public boolean checkFilesetDependenciesRecursively;
 
     @Option(
-        name = "experimental_throttle_action_cache_check",
+        name = "experimental_skyframe_native_filesets",
         defaultValue = "true",
-        converter = BooleanConverter.class,
         documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-        metadataTags = OptionMetadataTag.EXPERIMENTAL,
-        effectTags = {OptionEffectTag.EXECUTION},
-        help = "no-op")
-    public boolean throttleActionCacheCheck;
+        effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
+        deprecationWarning = "This flag is a no-op and skyframe-native-filesets is always true.")
+    public boolean skyframeNativeFileset;
   }
 
   /** This is where deprecated Bazel-specific options only used by the build command go to die. */