Fix xctest_app sources not showing up in ios_test coverage.

--
MOS_MIGRATED_REVID=95671328

3 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
index d23b21fd02..fd958c4cd1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java
@@ -166,7 +166,7 @@ public abstract class IosTest implements RuleConfiguredTargetFactory {
   }
 
   /** Returns the {@link XcTestAppProvider} of the {@code xctest_app} attribute. */
-  private static XcTestAppProvider xcTestAppProvider(RuleContext ruleContext) {
+  protected static XcTestAppProvider xcTestAppProvider(RuleContext ruleContext) {
     return ruleContext.getPrerequisite(XCTEST_APP, Mode.TARGET, XcTestAppProvider.class);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
index 0ae5036211..f403daa7db 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
@@ -342,10 +342,13 @@ public final class ReleaseBundlingSupport {
     // want to link anything since that stuff is shared automatically by way of the
     // -bundle_loader linker flag.
     ObjcProvider partialObjcProvider = new ObjcProvider.Builder()
+        .addTransitiveAndPropagate(ObjcProvider.GCNO, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.HEADER, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.INCLUDE, objcProvider)
+        .addTransitiveAndPropagate(ObjcProvider.INSTRUMENTED_SOURCE, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.SDK_DYLIB, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.SDK_FRAMEWORK, objcProvider)
+        .addTransitiveAndPropagate(ObjcProvider.SOURCE, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.WEAK_SDK_FRAMEWORK, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.FRAMEWORK_DIR, objcProvider)
         .addTransitiveAndPropagate(ObjcProvider.FRAMEWORK_FILE, objcProvider)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java
index 1fc5d5dbce..341eb7d1b3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java
@@ -23,7 +23,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
  * Supplies information needed when a dependency serves as an {@code xctest_app}.
  */
 @Immutable
-final class XcTestAppProvider implements TransitiveInfoProvider {
+public final class XcTestAppProvider implements TransitiveInfoProvider {
   private final Artifact bundleLoader;
   private final Artifact ipa;
   private final ObjcProvider objcProvider;