Remove the command line option --apple_grte_top.

RELNOTES[INC]: The --apple_compiler command line option is not available anymore.

PiperOrigin-RevId: 557386253
Change-Id: Ib55a44cc9d44cd13d6e492517333a5a385e2d9f0

src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java

@@ -195,20 +195,6 @@ public class AppleCommandLineOptions extends FragmentOptions {
   /** The default Catalyst CPU value. */
   public static final String DEFAULT_CATALYST_CPU = "x86_64";
 
-  @Option(
-    name = "apple_grte_top",
-    defaultValue = "null",
-    converter = LabelConverter.class,
-    documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
-    effectTags = {
-      OptionEffectTag.CHANGES_INPUTS,
-      OptionEffectTag.LOADING_AND_ANALYSIS,
-      OptionEffectTag.LOSES_INCREMENTAL_STATE,
-    },
-    help = "The Apple target grte_top."
-  )
-  public Label appleLibcTop;
-
   @Option(
     name = "apple_crosstool_top",
     defaultValue = "@bazel_tools//tools/cpp:toolchain",

src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java

@@ -465,7 +465,7 @@ public static ImmutableMap<String, BuildOptions> handleApplePlatforms(
 
       // The cpu flag will be set by platform mapping if a mapping exists.
       splitOptions.get(PlatformOptions.class).platforms = ImmutableList.of(platform);
-      setAppleCrosstoolTransitionPlatformConfiguration(buildOptions, splitOptions, platform);
+      setAppleCrosstoolTransitionPlatformConfiguration(splitOptions, platform);
       AppleCommandLineOptions appleCommandLineOptions =
           splitOptions.get(AppleCommandLineOptions.class);
       // Set the configuration distinguisher last, as the method
@@ -749,7 +749,7 @@ private static void setAppleCrosstoolTransitionCpuConfiguration(
     toOptions.cpu = cpu;
     toCppOptions.crosstoolTop = appleOptions.appleCrosstoolTop;
 
-    setAppleCrosstoolTransitionSharedConfiguration(from, to);
+    setAppleCrosstoolTransitionSharedConfiguration(to);
 
     // Ensure platforms aren't set so that platform mapping can take place.
     to.get(PlatformOptions.class).platforms = ImmutableList.of();
@@ -759,14 +759,13 @@ private static void setAppleCrosstoolTransitionCpuConfiguration(
    * Sets configuration fields required for a transition that uses apple_platforms in place of the
    * default platforms to find the appropriate CROSSTOOL and C++ configuration options.
    *
-   * @param from options from the originating configuration
    * @param to options for the destination configuration. This instance will be modified to so the
    *     destination configuration uses the apple crosstool
    * @param platform {@code --platforms} value for toolchain selection in the destination
    *     configuration
    */
   private static void setAppleCrosstoolTransitionPlatformConfiguration(
-      BuildOptionsView from, BuildOptionsView to, Label platform) {
+      BuildOptionsView to, Label platform) {
     PlatformOptions toPlatformOptions = to.get(PlatformOptions.class);
     ImmutableList<Label> incomingPlatform = ImmutableList.of(platform);
 
@@ -783,26 +782,23 @@ private static void setAppleCrosstoolTransitionPlatformConfiguration(
     // The cpu flag will be set by platform mapping if a mapping exists.
     to.get(PlatformOptions.class).platforms = incomingPlatform;
 
-    setAppleCrosstoolTransitionSharedConfiguration(from, to);
+    setAppleCrosstoolTransitionSharedConfiguration(to);
   }
 
   /**
    * Sets a common set of configuration fields required for a transition that needs to find the
    * appropriate CROSSTOOL and C++ configuration options.
    *
-   * @param from options from the originating configuration
    * @param to options for the destination configuration. This instance will be modified to so the
    *     destination configuration uses the apple crosstool
    */
-  private static void setAppleCrosstoolTransitionSharedConfiguration(
-      BuildOptionsView from, BuildOptionsView to) {
+  private static void setAppleCrosstoolTransitionSharedConfiguration(BuildOptionsView to) {
     to.get(AppleCommandLineOptions.class).configurationDistinguisher =
         ConfigurationDistinguisher.APPLE_CROSSTOOL;
 
-    AppleCommandLineOptions appleOptions = from.get(AppleCommandLineOptions.class);
     CppOptions toCppOptions = to.get(CppOptions.class);
     toCppOptions.cppCompiler = null;
-    toCppOptions.libcTopLabel = appleOptions.appleLibcTop;
+    toCppOptions.libcTopLabel = null;
 
     // OSX toolchains do not support fission.
     toCppOptions.fissionModes = ImmutableList.of();

src/main/starlark/builtins_bzl/common/objc/transitions.bzl

@@ -97,7 +97,7 @@ def _output_dictionary(settings, cpu, platform_type, platforms):
         ),
         "//command_line_option:platforms": platforms,
         "//command_line_option:fission": [],
-        "//command_line_option:grte_top": settings["//command_line_option:apple_grte_top"],
+        "//command_line_option:grte_top": None,
     }
 
 def _apple_crosstool_transition_impl(settings, attr):
@@ -127,7 +127,6 @@ _apple_rule_base_transition_inputs = [
     "//command_line_option:apple_crosstool_top",
     "//command_line_option:crosstool_top",
     "//command_line_option:apple_split_cpu",
-    "//command_line_option:apple_grte_top",
     "//command_line_option:cpu",
     "//command_line_option:ios_multi_cpus",
     "//command_line_option:macos_cpus",

src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java

@@ -64,7 +64,6 @@
 import com.google.devtools.common.options.OptionsParsingException;
 import java.util.Collection;
 import java.util.List;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -1540,25 +1539,6 @@ public void testFilesToCompileOutputGroup() throws Exception {
     checkFilesToCompileOutputGroup(RULE_TYPE);
   }
 
-  @Test
-  @Ignore("apple_grte_top isn't being applied because the cpu doesn't change")
-  public void testSysrootArgSpecifiedWithGrteTopFlag() throws Exception {
-    MockObjcSupport.setup(mockToolsConfig);
-    useConfiguration("--cpu=ios_x86_64", "--apple_grte_top=//x");
-    scratch.file(
-        "x/BUILD",
-        "objc_library(",
-        "   name = 'objc',",
-        "   srcs = ['source.m'],",
-        ")",
-        "filegroup(",
-        "    name = 'everything',",
-        "    srcs = ['header.h'],",
-        ")");
-    CommandAction compileAction = compileAction("//x:objc", "source.o");
-    assertThat(compileAction.getArguments()).contains("--sysroot=x");
-  }
-
   @Test
   public void testDefaultEnabledFeatureIsUsed() throws Exception {
     // Although using --cpu=ios_x86_64, it transitions to darwin_x86_64, so the actual