Automated rollback of commit f9a379157d1e992390c5b6f0b75ef853e0870689.

*** Reason for rollback ***

Breaks a single, but very important target :(

*** Original change description ***

Remove OS/Xcode versions (and thus package loading) from AppleConfiguration.Loader.

Fixes #3424.

RELNOTES[INC]: Selecting on "xcode_version" and
"{ios,tvos,macos,watchos}_sdk_version" is not supported anymore. What was config_setting(values={"$FOO_version": $VALUE}) is now config_setting(flag_values={"@bazel_tools//tools/osx:$FOO_version_flag": $VALUE}).

PiperOrigin-RevId: 173085962

2 files changed, 31 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index b0a5585470..ae217d3b54 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1108,6 +1108,23 @@ public class BuildViewTest extends BuildViewTestBase {
   }
 
   @Test
+  public void testMissingXcodeVersion() throws Exception {
+    // The xcode_version flag uses yet another code path on top of the redirect chaser.
+    // Note that the redirect chaser throws if it can't find a package, but doesn't throw if it
+    // can't find a label in a package - that's why we use an empty package here.
+    scratch.file("xcode/BUILD");
+    useConfiguration("--xcode_version=1.2", "--xcode_version_config=//xcode:does_not_exist");
+    reporter.removeHandler(failFastHandler);
+    try {
+      update(defaultFlags().with(Flag.KEEP_GOING));
+      fail();
+    } catch (InvalidConfigurationException e) {
+      assertThat(e).hasMessageThat().contains("//xcode:does_not_exist");
+    }
+  }
+
+
+  @Test
   public void testVisibilityReferencesNonexistentPackage() throws Exception {
     scratch.file("z/a/BUILD",
         "py_library(name='a', visibility=['//nonexistent:nothing'])");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
index 27d8987166..79d566af0e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.apple;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.SerializationException;
@@ -87,13 +88,23 @@ public class AppleConfigurationSerializationTest
       return new AppleConfiguration[] {
         new AppleConfiguration(
             firstOptions,
-            "iosCpuArg"),
+            "iosCpuArg",
+            DottedVersion.fromString("10.0"),
+            DottedVersion.fromString("11.0"),
+            DottedVersion.fromString("12.0"),
+            DottedVersion.fromString("13.0"),
+            DottedVersion.fromString("14.0"),
+            DottedVersion.fromString("15.0"),
+            DottedVersion.fromString("16.0"),
+            DottedVersion.fromString("17.0"),
+            DottedVersion.fromString("18.0")),
         AppleConfiguration.create(
             BuildOptions.of(ImmutableList.of(AppleCommandLineOptions.class))
                 .get(AppleCommandLineOptions.class),
-            "another cpu")
+            "another cpu",
+            XcodeVersionProperties.unknownXcodeVersionProperties())
       };
-    } catch (OptionsParsingException e) {
+    } catch (InvalidConfigurationException | OptionsParsingException e) {
       throw new IllegalStateException(e);
     }
   }