Rollback of commit deeeb31f8ba0f196fbc9ca2a177d59d57ea50b32.

*** Reason for rollback ***

Breaks builds with current blaze

*** Original change description ***

Add a way to select non-default Xcode toolchain

* Adds a flag --xcode_toolchain which sets TOOLCHAINS env variable for xcrun.
* Updates swift_library to work with this flag when selecting Swift runtime location.
* By default the flag has a null value and is not set in env.

--
MOS_MIGRATED_REVID=135053864

1 files changed, 0 insertions, 13 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
index e0d242703f..59a6fc1403 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java
@@ -84,7 +84,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
   private final ImmutableList<String> tvosCpus;
   private final AppleBitcodeMode bitcodeMode;
   private final Label xcodeConfigLabel;
-  @Nullable private final String xcodeToolchain;
   @Nullable private final Label defaultProvisioningProfileLabel;
   private final boolean disableNativeSwiftRules;
 
@@ -128,7 +127,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
     this.xcodeConfigLabel =
         Preconditions.checkNotNull(appleOptions.xcodeVersionConfig, "xcodeConfigLabel");
     this.defaultProvisioningProfileLabel = appleOptions.defaultProvisioningProfile;
-    this.xcodeToolchain = appleOptions.xcodeToolchain;
     this.disableNativeSwiftRules = appleOptions.disableNativeSwiftRules;
   }
 
@@ -521,17 +519,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment {
     return Joiner.on('-').join(components);
   }
 
-  /** Returns the identifier for an Xcode toolchain to use with tools. */
-  @SkylarkCallable(
-    name = "xcode_toolchain",
-    doc = "Identifier for the custom Xcode toolchain to use in build or None if not specified",
-    allowReturnNones = true,
-    structField = true
-  )
-  public String getXcodeToolchain() {
-    return xcodeToolchain;
-  }
-
   /**
    * Whether the native Swift support should be disabled. Used to deprecate said functionality.
    */