Move --experimental_allow_runtime_deps_on_neverlink to JavaOptions.

This migration flag only affects Java rules.

RELNOTES: None.
PiperOrigin-RevId: 171026607

1 files changed, 0 insertions, 19 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 bbb7393eb6..fd1fb453d9 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
@@ -502,18 +502,6 @@ public final class BuildConfiguration implements BuildEvent {
     public boolean extendedSanityChecks;
 
     @Option(
-      name = "experimental_allow_runtime_deps_on_neverlink",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = { OptionEffectTag.BUILD_FILE_SEMANTICS },
-      metadataTags = { OptionMetadataTag.EXPERIMENTAL },
-      help =
-          "Flag to help transition from allowing to disallowing runtime_deps on neverlink"
-              + " Java archives. The depot needs to be cleaned up to roll this out by default."
-    )
-    public boolean allowRuntimeDepsOnNeverLink;
-
-    @Option(
       name = "strict_filesets",
       defaultValue = "false",
       category = "semantics",
@@ -1049,9 +1037,6 @@ public final class BuildConfiguration implements BuildEvent {
       // === Fileset ===
       host.skyframeNativeFileset = skyframeNativeFileset;
 
-      // === Allow runtime_deps to depend on neverlink Java libraries.
-      host.allowRuntimeDepsOnNeverLink = allowRuntimeDepsOnNeverLink;
-
       // === Pass on C++ compiler features.
       host.defaultFeatures = ImmutableList.copyOf(defaultFeatures);
 
@@ -1657,10 +1642,6 @@ public final class BuildConfiguration implements BuildEvent {
             repositoryName, outputDirName, directories, mainRepositoryName);
   }
 
-  public boolean getAllowRuntimeDepsOnNeverLink() {
-    return options.allowRuntimeDepsOnNeverLink;
-  }
-
   public boolean isStrictFilesets() {
     return options.strictFilesets;
   }