Switch objc rules to standard coverage propagation using InstrumentedFilesCollector.

--
MOS_MIGRATED_REVID=103642172

1 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
index dd034b7f0c..b86e54fbe4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.RunfilesSupport;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.rules.test.ExecutionInfoProvider;
+import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider;
 
 /**
  * Implementation for {@code experimental_ios_test} rule in Bazel.
@@ -43,10 +44,11 @@ public final class ExperimentalIosTest extends IosTest {
     NestedSetBuilder<Artifact> filesToBuildBuilder = NestedSetBuilder.<Artifact>stableOrder()
         .addTransitive(filesToBuild);
 
-    TestSupport testSupport = new TestSupport(ruleContext)
-        .registerTestRunnerActions()
-        .addRunfiles(runfilesBuilder, common.getObjcProvider())
-        .addFilesToBuild(filesToBuildBuilder);
+    TestSupport testSupport =
+        new TestSupport(ruleContext)
+            .registerTestRunnerActions()
+            .addRunfiles(runfilesBuilder)
+            .addFilesToBuild(filesToBuildBuilder);
 
     Artifact executable = testSupport.generatedTestScript();
 
@@ -58,9 +60,13 @@ public final class ExperimentalIosTest extends IosTest {
         .setFilesToBuild(filesToBuildBuilder.build())
         .add(XcodeProvider.class, xcodeProvider)
         .add(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
-        .add(ExecutionInfoProvider.class,
+        .add(
+            ExecutionInfoProvider.class,
             new ExecutionInfoProvider(ImmutableMap.of(ExecutionRequirements.REQUIRES_DARWIN, "")))
-        .addProviders(testSupport.getExtraProviders(common.getObjcProvider()))
+        .addProvider(
+            InstrumentedFilesProvider.class,
+            new CompilationSupport(ruleContext).getInstrumentedFilesProvider(common))
+        .addProviders(testSupport.getExtraProviders())
         .setRunfilesSupport(runfilesSupport, executable)
         .build();
   }