Automated g4 rollback of commit 29ec1b89989db411d2038e2df8657b6435f80403.

*** Reason for rollback ***

Breaks the classroom_ios TAP project [1] in the presence of --experimental_objc_crosstool=all, which was added to the global .blazerc last week.

[1] []

*** Original change description ***

Change ProtobufSupport to use CrosstoolCompilationSupport if experimental_objc_crosstool=all

PiperOrigin-RevId: 158727100

1 files changed, 6 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java
index 5c06156207..d87616a1ad 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CrosstoolCompilationSupport.java
@@ -134,7 +134,6 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
         CompilationAttributes.Builder.fromRuleContext(ruleContext).build(),
         /*useDeps=*/ true,
         outputGroupCollector,
-        null,
         /*isTestRule=*/ false);
   }
 
@@ -146,7 +145,6 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
    * @param intermediateArtifacts IntermediateArtifacts for deriving artifact paths
    * @param compilationAttributes attributes of the calling target
    * @param useDeps true if deps should be used
-   * @param toolchain if not null overrides the default toolchain from the ruleContext.
    */
   public CrosstoolCompilationSupport(
       RuleContext ruleContext,
@@ -155,7 +153,6 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
       CompilationAttributes compilationAttributes,
       boolean useDeps,
       Map<String, NestedSet<Artifact>> outputGroupCollector,
-      CcToolchainProvider toolchain,
       boolean isTestRule) {
     super(
         ruleContext,
@@ -164,7 +161,6 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
         compilationAttributes,
         useDeps,
         outputGroupCollector,
-        toolchain,
         isTestRule);
   }
 
@@ -191,28 +187,18 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
 
       // TODO(b/30783125): Signal the need for this action in the CROSSTOOL.
       registerObjFilelistAction(getObjFiles(compilationArtifacts, intermediateArtifacts), objList);
-
+  
       extension.addVariableCategory(VariableCategory.ARCHIVE_VARIABLES);
-
+      
       helper =
           createCcLibraryHelper(
-                  objcProvider,
-                  compilationArtifacts,
-                  extension.build(),
-                  ccToolchain,
-                  fdoSupport,
-                  priorityHeaders)
+                  objcProvider, compilationArtifacts, extension.build(), ccToolchain, fdoSupport)
               .setLinkType(LinkTargetType.OBJC_ARCHIVE)
               .addLinkActionInput(objList);
     } else {
       helper =
           createCcLibraryHelper(
-              objcProvider,
-              compilationArtifacts,
-              extension.build(),
-              ccToolchain,
-              fdoSupport,
-              priorityHeaders);
+              objcProvider, compilationArtifacts, extension.build(), ccToolchain, fdoSupport);
     }
 
     Info info = helper.build();
@@ -392,8 +378,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
       CompilationArtifacts compilationArtifacts,
       VariablesExtension extension,
       CcToolchainProvider ccToolchain,
-      FdoSupportProvider fdoSupport,
-      Iterable<PathFragment> priorityHeaders) {
+      FdoSupportProvider fdoSupport) {
     PrecompiledFiles precompiledFiles = new PrecompiledFiles(ruleContext);
     Collection<Artifact> arcSources = ImmutableSortedSet.copyOf(compilationArtifacts.getSrcs());
     Collection<Artifact> nonArcSources =
@@ -412,8 +397,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
             createIncludeProcessing(privateHdrs, objcProvider, pchHdr),
             ruleContext.getFragment(ObjcConfiguration.class),
             isHeaderThinningEnabled(),
-            intermediateArtifacts,
-            buildConfiguration);
+            intermediateArtifacts);
     CcLibraryHelper result =
         new CcLibraryHelper(
                 ruleContext,
@@ -436,7 +420,6 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
             // generate C++ protos.
             .setCheckDepsGenerateCpp(false)
             .addCopts(getCompileRuleCopts())
-            .addIncludeDirs(priorityHeaders)
             .addIncludeDirs(objcProvider.get(INCLUDE))
             .addCopts(ruleContext.getFragment(ObjcConfiguration.class).getCoptsForCompilationMode())
             .addSystemIncludeDirs(objcProvider.get(INCLUDE_SYSTEM))