Move --build_python_zip into PythonConfiguration.

There's no need for it in the core configuration options, as it's used
exclusively by Python rules.

RELNOTES: None.
PiperOrigin-RevId: 169435643

1 files changed, 0 insertions, 21 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 9774cb7a56..51e6883457 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
@@ -994,15 +994,6 @@ public final class BuildConfiguration implements BuildEvent {
     public TriState enableRunfiles;
 
     @Option(
-      name = "build_python_zip",
-      defaultValue = "auto",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help = "Build python executable zip; on on Windows, off on other platforms"
-    )
-    public TriState buildPythonZip;
-
-    @Option(
       name = "windows_exe_launcher",
       defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
@@ -1022,7 +1013,6 @@ public final class BuildConfiguration implements BuildEvent {
       host.isHost = true;
       host.configsMode = configsMode;
       host.enableRunfiles = enableRunfiles;
-      host.buildPythonZip = buildPythonZip;
       host.windowsExeLauncher = windowsExeLauncher;
       host.commandLineBuildVariables = commandLineBuildVariables;
       host.enforceConstraints = enforceConstraints;
@@ -2030,17 +2020,6 @@ public final class BuildConfiguration implements BuildEvent {
     }
   }
 
-  public boolean buildPythonZip() {
-    switch (options.buildPythonZip) {
-      case YES:
-        return true;
-      case NO:
-        return false;
-      default:
-        return OS.getCurrent() == OS.WINDOWS;
-    }
-  }
-
   public boolean enableWindowsExeLauncher() {
     return options.windowsExeLauncher;
   }