Remove unused dsym type info from ObjcVariablesExtension.

WANT_LGTM=all
PiperOrigin-RevId: 153584480

2 files changed, 2 insertions, 14 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 e3168bf068..e0dd59283d 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
@@ -303,8 +303,7 @@ public class CrosstoolCompilationSupport extends CompilationSupport {
       Artifact dsymBundleZip = intermediateArtifacts.tempDsymBundleZip(dsymOutputType);
       extensionBuilder
           .setDsymBundleZip(dsymBundleZip)
-          .addVariableCategory(VariableCategory.DSYM_VARIABLES)
-          .setDsymOutputType(dsymOutputType);
+          .addVariableCategory(VariableCategory.DSYM_VARIABLES);
       registerDsymActions(dsymOutputType);
       executableLinkAction.addActionOutput(dsymBundleZip);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java
index 99c44948fc..bf43087e5a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java
@@ -75,7 +75,6 @@ class ObjcVariablesExtension implements VariablesExtension {
   private final ImmutableSet<Artifact> forceLoadArtifacts;
   private final ImmutableList<String> attributeLinkopts;
   private final ImmutableSet<VariableCategory> activeVariableCategories;
-  private final DsymOutputType dsymOutputType;
   private final Artifact dsymBundleZip;
   private final Artifact linkmap;
   private final Artifact bitcodeSymbolMap;
@@ -92,7 +91,6 @@ class ObjcVariablesExtension implements VariablesExtension {
       ImmutableSet<Artifact> forceLoadArtifacts,
       ImmutableList<String> attributeLinkopts,
       ImmutableSet<VariableCategory> activeVariableCategories,
-      DsymOutputType dsymOutputType,
       Artifact dsymBundleZip,
       Artifact linkmap,
       Artifact bitcodeSymbolMap) {
@@ -108,7 +106,6 @@ class ObjcVariablesExtension implements VariablesExtension {
     this.forceLoadArtifacts = forceLoadArtifacts;
     this.attributeLinkopts = attributeLinkopts;
     this.activeVariableCategories = activeVariableCategories;
-    this.dsymOutputType = dsymOutputType;
     this.dsymBundleZip = dsymBundleZip;
     this.linkmap = linkmap;
     this.bitcodeSymbolMap = bitcodeSymbolMap;
@@ -254,7 +251,6 @@ class ObjcVariablesExtension implements VariablesExtension {
     private ImmutableSet<Artifact> forceLoadArtifacts;
     private ImmutableList<String> libraryNames;
     private ImmutableList<String> attributeLinkopts;
-    private DsymOutputType dsymOutputType;
     private Artifact dsymBundleZip;
     private Artifact linkmap;
     private Artifact bitcodeSymbolMap;
@@ -328,12 +324,6 @@ class ObjcVariablesExtension implements VariablesExtension {
       return this;
     }
 
-    /** Sets the dsym type for the dsym bundle generated by this target. */
-    public Builder setDsymOutputType(DsymOutputType dsymOutputType) {
-      this.dsymOutputType = dsymOutputType;
-      return this;
-    }
-
     /** Sets the Artifact for the zipped dsym bundle. */
     public Builder setDsymBundleZip(Artifact dsymBundleZip) {
       this.dsymBundleZip = dsymBundleZip;
@@ -374,7 +364,7 @@ class ObjcVariablesExtension implements VariablesExtension {
         Preconditions.checkNotNull(attributeLinkopts, "missing attribute linkopts");
       }
       if (activeVariableCategories.contains(VariableCategory.DSYM_VARIABLES)) {
-        Preconditions.checkNotNull(dsymOutputType, "missing dsym output type");
+        Preconditions.checkNotNull(dsymBundleZip, "missing dsym bundle zip artifact");
       }
       if (activeVariableCategories.contains(VariableCategory.LINKMAP_VARIABLES)) {
         Preconditions.checkNotNull(linkmap, "missing linkmap artifact");
@@ -395,7 +385,6 @@ class ObjcVariablesExtension implements VariablesExtension {
           forceLoadArtifacts,
           attributeLinkopts,
           activeVariableCategories,
-          dsymOutputType,
           dsymBundleZip,
           linkmap,
           bitcodeSymbolMap);