Automated rollback of commit 6cfffdf37e11018c7e6e2cabc90440d6d29c819b.

PiperOrigin-RevId: 163889699

1 files changed, 1 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
index 30b9710604..0e1f2f63d5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.rules.cpp.CppCompilationContext.Builder;
 import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder;
@@ -47,7 +46,6 @@ public class ObjcCppSemantics implements CppSemantics {
   private final ObjcConfiguration config;
   private final boolean isHeaderThinningEnabled;
   private final IntermediateArtifacts intermediateArtifacts;
-  private final BuildConfiguration buildConfiguration;
 
   /**
    * Set of {@link com.google.devtools.build.lib.util.FileType} of source artifacts that are
@@ -71,21 +69,18 @@ public class ObjcCppSemantics implements CppSemantics {
    * @param isHeaderThinningEnabled true if headers_list artifacts should be generated and added as
    *     input to compiling actions
    * @param intermediateArtifacts used to create headers_list artifacts
-   * @param buildConfiguration the build configuration for this build
    */
   public ObjcCppSemantics(
       ObjcProvider objcProvider,
       IncludeProcessing includeProcessing,
       ObjcConfiguration config,
       boolean isHeaderThinningEnabled,
-      IntermediateArtifacts intermediateArtifacts,
-      BuildConfiguration buildConfiguration) {
+      IntermediateArtifacts intermediateArtifacts) {
     this.objcProvider = objcProvider;
     this.includeProcessing = includeProcessing;
     this.config = config;
     this.isHeaderThinningEnabled = isHeaderThinningEnabled;
     this.intermediateArtifacts = intermediateArtifacts;
-    this.buildConfiguration = buildConfiguration;
   }
 
   @Override
@@ -137,14 +132,6 @@ public class ObjcCppSemantics implements CppSemantics {
         ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration())) {
       contextBuilder.addQuoteIncludeDir(iquotePath);
     }
-
-    // ProtoSupport creates multiple compilation contexts for a single rule, potentially multiple
-    // archives per build configuration. This covers that worst case.
-    contextBuilder.setPurpose(
-        "ObjcCppSemantics_build_arch_"
-            + buildConfiguration.getMnemonic()
-            + "_with_suffix_"
-            + intermediateArtifacts.archiveFileNameSuffix());
   }
 
   @Override