Allow ios_application in xctest_app attribute.

RELNOTES: Allow ios_application in xctest_app attribute.

--
MOS_MIGRATED_REVID=88730548

3 files changed, 4 insertions, 3 deletions

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 d253cf693a..3aa70e51eb 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
@@ -682,7 +682,8 @@ public class ObjcRuleClasses {
                 }
               })
               .allowedFileTypes()
-              .allowedRuleClasses("objc_binary"))
+              // TODO(bazel-team): Remove objc_binary once it stops exporting XcTestAppProvider.
+              .allowedRuleClasses("objc_binary", "ios_application"))
           .override(attr("infoplist", LABEL)
               .value(new Attribute.ComputedDefault(IosTest.IS_XCTEST) {
                 @Override
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 67befa23d4..43edc4d564 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
@@ -309,7 +309,7 @@ public final class ReleaseBundlingSupport {
         .build();
     // TODO(bazel-team): Handle the FRAMEWORK_DIR key properly. We probably want to add it to
     // framework search paths, but not actually link it with the -framework flag.
-    return new XcTestAppProvider(intermediateArtifacts.singleArchitectureBinary(),
+    return new XcTestAppProvider(intermediateArtifacts.combinedArchitectureBinary(),
         ruleContext.getImplicitOutputArtifact(IPA), partialObjcProvider);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingTargetFactory.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingTargetFactory.java
index 88481393b9..10a1f2e41a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingTargetFactory.java
@@ -98,7 +98,7 @@ public abstract class ReleaseBundlingTargetFactory implements RuleConfiguredTarg
         filesToBuild.build(),
         Optional.of(xcodeProviderBuilder.build()),
         exposedObjcProvider,
-        Optional.<XcTestAppProvider>absent(),
+        Optional.of(releaseBundlingSupport.xcTestAppProvider()),
         Optional.<J2ObjcSrcsProvider>absent());
     configureTarget(target, ruleContext, releaseBundlingSupport);
     return target.build();