PiperOrigin-RevId: 202296332

1 files changed, 2 insertions, 22 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ShellConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/ShellConfiguration.java
index 2fab7708d1..f2dd58db01 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ShellConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ShellConfiguration.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.vfs.PathFragment;
 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 java.io.Serializable;
 import javax.annotation.Nullable;
 
@@ -41,21 +40,15 @@ public class ShellConfiguration extends BuildConfiguration.Fragment {
           .build();
 
   private final PathFragment shellExecutable;
-  private final boolean useShBinaryStubScript;
 
-  public ShellConfiguration(PathFragment shellExecutable, boolean useShBinaryStubScript) {
+  public ShellConfiguration(PathFragment shellExecutable) {
     this.shellExecutable = shellExecutable;
-    this.useShBinaryStubScript = useShBinaryStubScript;
   }
 
   public PathFragment getShellExecutable() {
     return shellExecutable;
   }
 
-  public boolean useShBinaryStubScript() {
-    return useShBinaryStubScript;
-  }
-
   /** An option that tells Bazel where the shell is. */
   @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS)
   public static class Options extends FragmentOptions {
@@ -76,20 +69,10 @@ public class ShellConfiguration extends BuildConfiguration.Fragment {
     )
     public PathFragment shellExecutable;
 
-    @Option(
-        name = "experimental_use_sh_binary_stub_script",
-        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-        effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
-        metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-        defaultValue = "false",
-        help = "If enabled, use a stub script for sh_binary targets.")
-    public boolean useShBinaryStubScript;
-
     @Override
     public Options getHost() {
       Options host = (Options) getDefault();
       host.shellExecutable = shellExecutable;
-      host.useShBinaryStubScript = useShBinaryStubScript;
       return host;
     }
   }
@@ -118,10 +101,7 @@ public class ShellConfiguration extends BuildConfiguration.Fragment {
     @Nullable
     @Override
     public Fragment create(BuildOptions buildOptions) {
-      Options options = buildOptions.get(Options.class);
-      return new ShellConfiguration(
-          shellExecutableProvider.getShellExecutable(buildOptions),
-          options != null && options.useShBinaryStubScript);
+        return new ShellConfiguration(shellExecutableProvider.getShellExecutable(buildOptions));
     }
 
     public static PathFragment determineShellExecutable(