Don't load dumpsyms in configurations.

RELNOTES[INC]: Removed --objc_dump_syms_binary.

--
MOS_MIGRATED_REVID=113186554

4 files changed, 3 insertions, 45 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index d2458c9b68..f05949c1c0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -1223,7 +1223,7 @@ public final class CompilationSupport {
             .addOutput(debugSymbolFile)
             .build(ruleContext));
 
-    Artifact dumpsyms = ruleContext.getPrerequisiteArtifact(":dumpsyms", Mode.HOST);
+    Artifact dumpsyms = ruleContext.getPrerequisiteArtifact("$dumpsyms", Mode.HOST);
     Artifact breakpadFile = intermediateArtifacts.breakpadSym();
     ruleContext.registerAction(ObjcRuleClasses.spawnOnDarwinActionBuilder()
         .setMnemonic("GenBreakpad")
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
index 6a0b333887..6c37619b5e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
@@ -16,12 +16,8 @@ package com.google.devtools.build.lib.rules.objc;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Multimap;
-import com.google.devtools.build.lib.Constants;
-import com.google.devtools.build.lib.analysis.config.BuildConfiguration.DefaultLabelConverter;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
 import com.google.devtools.build.lib.rules.apple.DottedVersionConverter;
@@ -36,13 +32,6 @@ import java.util.List;
  * Command-line options for building Objective-C targets.
  */
 public class ObjcCommandLineOptions extends FragmentOptions {
-  /** Converter for --objc_dump_syms_binary. */
-  public static class DumpSymsConverter extends DefaultLabelConverter {
-    public DumpSymsConverter() {
-      super(Constants.TOOLS_REPOSITORY + "//tools/objc:dump_syms");
-    }
-  }
-
   @Option(
     name = "ios_simulator_version",
     defaultValue = "8.4",
@@ -98,12 +87,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
           "Don't set this value from the command line - it is derived from  ios_multi_cpus only.")
   public String iosSplitCpu;
 
-  @Option(name = "objc_dump_syms_binary",
-      defaultValue = "",
-      category = "undocumented",
-      converter = DumpSymsConverter.class)
-  public Label dumpSyms;
-
   @Option(name = "experimental_enable_objc_cc_deps",
       defaultValue = "false",
       category = "undocumented",
@@ -182,13 +165,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
   @VisibleForTesting static final String DEFAULT_MINIMUM_IOS = "7.0";
 
   @Override
-  public void addAllLabels(Multimap<String, Label> labelMap) {
-    if (generateDebugSymbols) {
-      labelMap.put("dump_syms", dumpSyms);
-    }
-  }
-
-  @Override
   public List<SplitTransition<BuildOptions>> getPotentialSplitTransitions() {
     return ImmutableList.of(
         IosApplication.SPLIT_ARCH_TRANSITION, IosExtension.MINIMUM_OS_AND_SPLIT_ARCH_TRANSITION);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index f0a0c4bde5..7b3584ce52 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -70,7 +70,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   // configuration, the late bound attribute will fail to be initialized because it hasn't been
   // loaded.
   @Nullable private final Label gcovLabel;
-  @Nullable private final Label dumpSymsLabel;
 
   ObjcConfiguration(ObjcCommandLineOptions objcOptions, BuildConfiguration.Options options,
       @Nullable BlazeDirectories directories) {
@@ -84,7 +83,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     this.copts = ImmutableList.copyOf(objcOptions.copts);
     this.compilationMode = Preconditions.checkNotNull(options.compilationMode, "compilationMode");
     this.gcovLabel = options.objcGcovBinary;
-    this.dumpSymsLabel = objcOptions.dumpSyms;
     this.iosSplitCpu = Preconditions.checkNotNull(objcOptions.iosSplitCpu, "iosSplitCpu");
     this.fastbuildOptions = ImmutableList.copyOf(objcOptions.fastbuildOptions);
     this.enableBinaryStripping = objcOptions.enableBinaryStripping;
@@ -164,14 +162,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   }
 
   /**
-   * Returns the label of the dump_syms binary, used to get debug symbols from a binary. Null iff
-   * !{@link #generateDebugSymbols}.
-   */
-  @Nullable public Label getDumpSymsLabel() {
-    return dumpSymsLabel;
-  }
-
-  /**
    * Whether module map generation and interpretation is enabled.
    */
   public boolean moduleMapsEnabled() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 1742eadba0..a18b46bd52 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -776,18 +776,10 @@ public class ObjcRuleClasses {
     @Override
     public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
       return builder
-          .add(attr(":dumpsyms", LABEL)
+          .add(attr("$dumpsyms", LABEL)
           .cfg(HOST)
           .singleArtifact()
-          .value(new LateBoundLabel<BuildConfiguration>(ObjcConfiguration.class) {
-            @Override
-            public Label getDefault(Rule rule, BuildConfiguration configuration) {
-              if (!configuration.getFragment(ObjcConfiguration.class).generateDebugSymbols()) {
-                return null;
-              }
-              return configuration.getFragment(ObjcConfiguration.class).getDumpSymsLabel();
-            }
-          }))
+          .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:dump_syms")))
           .add(attr("$j2objc_dead_code_pruner", LABEL)
               .allowedFileTypes(FileType.of(".py"))
               .cfg(HOST)