Delete unused variables in ObjcVariablesExtension

Leftover from starlark migration.

PiperOrigin-RevId: 543567821
Change-Id: If4e5341ec4c9d484ad779163d0ced861a3cab431

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

@@ -619,7 +619,6 @@ public CompilationSupport registerLinkActions(
  ObjcVariablesExtension.Builder extensionBuilder =
  new ObjcVariablesExtension.Builder()
  .setRuleContext(ruleContext)
- .setConfiguration(buildConfiguration)
  .setIntermediateArtifacts(intermediateArtifacts)
  .setForceLoadArtifacts(alwaysLinkLibrarySet)
  .setAttributeLinkopts(attributes.linkopts())

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

@@ -19,7 +19,6 @@
 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.BuildConfigurationValue;
 import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariablesExtension;
@@ -32,9 +31,6 @@ class ObjcVariablesExtension implements VariablesExtension {
 
  static final String PCH_FILE_VARIABLE_NAME = "pch_file";
  static final String FRAMEWORKS_PATH_NAME = "framework_paths";
- static final String OBJC_MODULE_CACHE_DIR_NAME = "_objc_module_cache";
- static final String OBJC_MODULE_CACHE_KEY = "modules_cache_path";
- static final String ARCHIVE_PATH_VARIABLE_NAME = "archive_path";
  static final String LINKMAP_EXEC_PATH = "linkmap_exec_path";
 
  // executable linking variables
@@ -50,13 +46,8 @@ class ObjcVariablesExtension implements VariablesExtension {
  // dsym variables
  static final String DSYM_PATH_VARIABLE_NAME = "dsym_path";
 
- // ARC variables. Mutually exclusive.
- static final String OBJC_ARC_VARIABLE_NAME = "objc_arc";
- static final String NO_OBJC_ARC_VARIABLE_NAME = "no_objc_arc";
-
  private final RuleContext ruleContext;
  private final IntermediateArtifacts intermediateArtifacts;
- private final BuildConfigurationValue buildConfiguration;
  private final ImmutableList<String> frameworkSearchPaths;
  private final ImmutableList<String> frameworkNames;
  private final ImmutableList<String> weakFrameworkNames;
@@ -67,12 +58,10 @@ class ObjcVariablesExtension implements VariablesExtension {
  private final ImmutableSet<VariableCategory> activeVariableCategories;
  private final Artifact dsymSymbol;
  private final Artifact linkmap;
- private boolean arcEnabled = true;
 
  private ObjcVariablesExtension(
  RuleContext ruleContext,
  IntermediateArtifacts intermediateArtifacts,
- BuildConfigurationValue buildConfiguration,
  ImmutableList<String> frameworkSearchPaths,
  ImmutableList<String> frameworkNames,
  ImmutableList<String> weakFrameworkNames,
@@ -82,11 +71,9 @@ private ObjcVariablesExtension(
  ImmutableList<String> attributeLinkopts,
  ImmutableSet<VariableCategory> activeVariableCategories,
  Artifact dsymSymbol,
- Artifact linkmap,
- boolean arcEnabled) {
+ Artifact linkmap) {
  this.ruleContext = ruleContext;
  this.intermediateArtifacts = intermediateArtifacts;
- this.buildConfiguration = buildConfiguration;
  this.frameworkSearchPaths = frameworkSearchPaths;
  this.frameworkNames = frameworkNames;
  this.weakFrameworkNames = weakFrameworkNames;
@@ -97,23 +84,18 @@ private ObjcVariablesExtension(
  this.activeVariableCategories = activeVariableCategories;
  this.dsymSymbol = dsymSymbol;
  this.linkmap = linkmap;
- this.arcEnabled = arcEnabled;
  }
 
  /** Type of build variable that can optionally exported by this extension. */
  public enum VariableCategory {
  EXECUTABLE_LINKING_VARIABLES,
  DSYM_VARIABLES,
- LINKMAP_VARIABLES,
- MODULE_MAP_VARIABLES
+ LINKMAP_VARIABLES
  }
 
  @Override
  public void addVariables(CcToolchainVariables.Builder builder) {
  addPchVariables(builder);
- if (activeVariableCategories.contains(VariableCategory.MODULE_MAP_VARIABLES)) {
- addModuleMapVariables(builder);
- }
  if (activeVariableCategories.contains(VariableCategory.EXECUTABLE_LINKING_VARIABLES)) {
  addExecutableLinkVariables(builder);
  }
@@ -123,11 +105,6 @@ public void addVariables(CcToolchainVariables.Builder builder) {
  if (activeVariableCategories.contains(VariableCategory.LINKMAP_VARIABLES)) {
  addLinkmapVariables(builder);
  }
- if (arcEnabled) {
- builder.addStringVariable(OBJC_ARC_VARIABLE_NAME, "");
- } else {
- builder.addStringVariable(NO_OBJC_ARC_VARIABLE_NAME, "");
- }
  }
 
  private void addPchVariables(CcToolchainVariables.Builder builder) {
@@ -138,14 +115,6 @@ private void addPchVariables(CcToolchainVariables.Builder builder) {
  }
  }
 
- private void addModuleMapVariables(CcToolchainVariables.Builder builder) {
- builder.addStringVariable(
- OBJC_MODULE_CACHE_KEY,
- buildConfiguration.getGenfilesFragment(ruleContext.getRepository())
- + "/"
- + OBJC_MODULE_CACHE_DIR_NAME);
- }
-
  private void addExecutableLinkVariables(CcToolchainVariables.Builder builder) {
  builder.addStringSequenceVariable(FRAMEWORKS_PATH_NAME, frameworkSearchPaths);
  builder.addStringSequenceVariable(
@@ -183,7 +152,6 @@ private void addLinkmapVariables(CcToolchainVariables.Builder builder) {
  static class Builder {
  private RuleContext ruleContext;
  private IntermediateArtifacts intermediateArtifacts;
- private BuildConfigurationValue buildConfiguration;
  private ImmutableList<String> frameworkSearchPaths;
  private ImmutableList<String> frameworkNames;
  private ImmutableList<String> weakFrameworkNames;
@@ -193,7 +161,6 @@ static class Builder {
  private ImmutableList<String> attributeLinkopts;
  private Artifact dsymSymbol;
  private Artifact linkmap;
- private boolean arcEnabled = true;
 
  private final ImmutableSet.Builder<VariableCategory> activeVariableCategoriesBuilder =
  ImmutableSet.builder();
@@ -212,13 +179,6 @@ public Builder setIntermediateArtifacts(IntermediateArtifacts intermediateArtifa
  return this;
  }
 
- /** Sets the configuration for this extension. */
- @CanIgnoreReturnValue
- public Builder setConfiguration(BuildConfigurationValue buildConfiguration) {
- this.buildConfiguration = Preconditions.checkNotNull(buildConfiguration);
- return this;
- }
-
  /** Sets the framework search paths to be passed to the compiler/linker using {@code -F}. */
  @CanIgnoreReturnValue
  public Builder setFrameworkSearchPath(ImmutableList<String> frameworkSearchPaths) {
@@ -289,20 +249,12 @@ public Builder setLinkmap(Artifact linkmap) {
  return this;
  }
 
- /** Sets whether ARC is enabled. */
- @CanIgnoreReturnValue
- public Builder setArcEnabled(boolean enabled) {
- this.arcEnabled = enabled;
- return this;
- }
-
  public ObjcVariablesExtension build() {
 
  ImmutableSet<VariableCategory> activeVariableCategories =
  activeVariableCategoriesBuilder.build();
 
  Preconditions.checkNotNull(ruleContext, "missing RuleContext");
- Preconditions.checkNotNull(buildConfiguration, "missing BuildConfigurationValue");
  Preconditions.checkNotNull(intermediateArtifacts, "missing IntermediateArtifacts");
  if (activeVariableCategories.contains(VariableCategory.EXECUTABLE_LINKING_VARIABLES)) {
  Preconditions.checkNotNull(frameworkSearchPaths, "missing FrameworkSearchPaths");
@@ -323,7 +275,6 @@ public ObjcVariablesExtension build() {
  return new ObjcVariablesExtension(
  ruleContext,
  intermediateArtifacts,
- buildConfiguration,
  frameworkSearchPaths,
  frameworkNames,
  weakFrameworkNames,
@@ -333,8 +284,7 @@ public ObjcVariablesExtension build() {
  attributeLinkopts,
  activeVariableCategories,
  dsymSymbol,
- linkmap,
- arcEnabled);
+ linkmap);
  }
  }
 }