Refer to objc's gcov under @bazel_tools

This is part of removing the requirement of having base_workspace in your
package_path for bazel builds.

This also removes --experimental_objc_gcov_binary, since it doesn't seem to be needed anymore.

--
MOS_MIGRATED_REVID=112595137

1 files changed, 0 insertions, 10 deletions

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 3e12c00a33..f0a0c4bde5 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 experimentalGcovLabel;
   @Nullable private final Label dumpSymsLabel;
 
   ObjcConfiguration(ObjcCommandLineOptions objcOptions, BuildConfiguration.Options options,
@@ -85,7 +84,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.experimentalGcovLabel = options.experimentalObjcGcovBinary;
     this.dumpSymsLabel = objcOptions.dumpSyms;
     this.iosSplitCpu = Preconditions.checkNotNull(objcOptions.iosSplitCpu, "iosSplitCpu");
     this.fastbuildOptions = ImmutableList.copyOf(objcOptions.fastbuildOptions);
@@ -166,14 +164,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   }
 
   /**
-   * Returns the label of the experimental gcov binary, used to get test coverage data for {@code
-   * experimental_ios_test}. Null iff not in coverage mode.
-   */
-  @Nullable public Label getExperimentalGcovLabel() {
-    return experimentalGcovLabel;
-  }
-
-  /**
    * Returns the label of the dump_syms binary, used to get debug symbols from a binary. Null iff
    * !{@link #generateDebugSymbols}.
    */