Make the skyframe-native flag a no-op.

RELNOTES: None
PiperOrigin-RevId: 192349971

1 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 4646a73565..b2b77314b3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -696,8 +696,7 @@ public class BuildConfiguration {
       defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},
-      deprecationWarning = "Skyframe-native filesets are now the default, and legacy "
-              + "implementation will be removed soon."
+      deprecationWarning = "This flag is a no-op and skyframe-native-filesets is always true."
     )
     public boolean skyframeNativeFileset;
 
@@ -965,9 +964,6 @@ public class BuildConfiguration {
       // === Licenses ===
       host.checkLicenses = checkLicenses;
 
-      // === Fileset ===
-      host.skyframeNativeFileset = skyframeNativeFileset;
-
       // === Pass on C++ compiler features.
       host.defaultFeatures = ImmutableList.copyOf(defaultFeatures);
 
@@ -1745,7 +1741,7 @@ public class BuildConfiguration {
   }
 
   public boolean getSkyframeNativeFileset() {
-    return options.skyframeNativeFileset;
+    return true;
   }
 
   /**