Automated [] rollback of [].

*** Reason for rollback ***

This is not needed thanks to blaze query.

*** Original change description ***

Make xctest_app's .ipa an implicit output so that scripts external to Bazel can access it.

--
MOS_MIGRATED_REVID=87507266

3 files changed, 4 insertions, 29 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
index 38059443f4..d2454a363a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/BazelIosTestRule.java
@@ -46,13 +46,12 @@ public final class BazelIosTestRule implements RuleDefinition {
         <ul>
           <li><code><var>name</var>.ipa</code>: the test bundle as an
               <code>.ipa</code> file
-          <li><code><var>name</var>.xcodeproj/project.pbxproj</code>: An Xcode project file which
-              can be used to develop or build on a Mac
-          <li><code><var>name</var>_xctest_app.ipa</code>: ipa for the {@code xctest_app} binary
+          <li><code><var>name</var>.xcodeproj/project.pbxproj: An Xcode project file which can be
+              used to develop or build on a Mac.</li>
         </ul>
         <!-- #END_BLAZE_RULE.IMPLICIT_OUTPUTS -->*/
-        .setImplicitOutputsFunction(ImplicitOutputsFunction.fromFunctions(
-            ReleaseBundlingSupport.IPA, XcodeSupport.PBXPROJ, ObjcRuleClasses.XCTEST_APP_IPA))
+        .setImplicitOutputsFunction(
+            ImplicitOutputsFunction.fromFunctions(ReleaseBundlingSupport.IPA, XcodeSupport.PBXPROJ))
         .add(attr(BazelIosTest.IOS_TEST_ON_BAZEL_ATTR, LABEL)
             .value(env.getLabel("//tools/objc:ios_test_on_bazel")).exec())
         .build();
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 4092a17442..87e3c209e7 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
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Type;
@@ -102,13 +101,6 @@ public abstract class IosTest implements RuleConfiguredTargetFactory {
           "-bundle_loader", bundleLoader.getExecPathString());
 
       extraLinkInputs = new ExtraLinkInputs(bundleLoader);
-
-      ruleContext.registerAction(
-          new SymlinkAction(
-              ruleContext.getActionOwner(),
-              /*input=*/xcTestAppProvider(ruleContext).getIpa(),
-              /*output=*/ruleContext.getImplicitOutputArtifact(ObjcRuleClasses.XCTEST_APP_IPA),
-              "Symlink xctest_app .ipa"));
     }
 
     if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
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 562580d5a3..4614afd920 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
@@ -38,8 +38,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.AttributeMap;
-import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
-import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SafeImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
@@ -630,20 +628,6 @@ public class ObjcRuleClasses {
   }
 
   /**
-   * Output function for the .ipa containing the {@code xctest_app}, also known as the test rig.
-   * This is useful for external-to-Bazel scripts that require the test rig {@code .ipa}.
-   */
-  public static final SafeImplicitOutputsFunction XCTEST_APP_IPA =
-      new SafeImplicitOutputsFunction() {
-    @Override
-    public Iterable<String> getImplicitOutputs(AttributeMap map) {
-      return map.get(IosTest.IS_XCTEST, Type.BOOLEAN)
-          ? ImplicitOutputsFunction.substitutePlaceholderIntoTemplate("%{name}_xctest_app.ipa", map)
-          : ImmutableList.<String>of();
-    }
-  };
-
-  /**
    * Base rule definition for iOS test rules.
    */
   @BlazeRule(name = "$ios_test_base_rule",