Set family to constant "watch" for watchOS2 extension and application.

Also, the watch2 extension rule (and future bundling rules which depend on apple_binary) now depend on the combined-arch library
of that apple_binary dependency, instead of re-lipoing the binaries themselves.

--
MOS_MIGRATED_REVID=132077913

1 files changed, 32 insertions, 14 deletions

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 476f274db9..9a1c601e5e 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
@@ -297,12 +297,12 @@ public final class ReleaseBundlingSupport {
       throws InterruptedException {
     bundleSupport.registerActions(objcProvider);
 
-    registerCombineArchitecturesAction();
+    Artifact combinedArchBinary = prepareCombinedArchitecturesArtifact();
     registerCopyDsymFilesAction(dsymOutputType);
     registerCopyDsymPlistAction(dsymOutputType);
     registerCopyLinkmapFilesAction();
-    registerSwiftStdlibActionsIfNecessary();
-    registerSwiftSupportActionsIfNecessary();
+    registerSwiftStdlibActionsIfNecessary(combinedArchBinary);
+    registerSwiftSupportActionsIfNecessary(combinedArchBinary);
 
     registerEmbedLabelPlistAction();
     registerEnvironmentPlistAction();
@@ -806,17 +806,17 @@ public final class ReleaseBundlingSupport {
     return bundling.build();
   }
 
-  private void registerCombineArchitecturesAction() {
-    // Skip combining binaries when building for watch as there is only one stub binary and it
-    // it should not be corrupted when combining.
-    if (bundleSupport.isBuildingForWatch()) {
-      return;
+  private Artifact prepareCombinedArchitecturesArtifact() {
+    Artifact dependentMultiArchBinary = attributes.dependentMultiArchBinary();
+    if (dependentMultiArchBinary != null) {
+      return dependentMultiArchBinary;
     }
 
     Artifact resultingLinkedBinary = intermediateArtifacts.combinedArchitectureBinary();
 
     new LipoSupport(ruleContext).registerCombineArchitecturesAction(linkedBinaries(),
         resultingLinkedBinary, platform);
+    return resultingLinkedBinary;
   }
 
   private NestedSet<Artifact> linkedBinaries() {
@@ -1050,7 +1050,7 @@ public final class ReleaseBundlingSupport {
   }
 
   /** Registers an action to copy Swift standard library dylibs into app bundle. */
-  private void registerSwiftStdlibActionsIfNecessary() {
+  private void registerSwiftStdlibActionsIfNecessary(Artifact combinedArchBinary) {
     if (!objcProvider.is(USES_SWIFT)) {
       return;
     }
@@ -1061,7 +1061,7 @@ public final class ReleaseBundlingSupport {
             .add("Frameworks")
             .add("--platform")
             .add(platform.getLowerCaseNameInPlist())
-            .addExecPath("--scan-executable", intermediateArtifacts.combinedArchitectureBinary());
+            .addExecPath("--scan-executable", combinedArchBinary);
 
     ruleContext.registerAction(
         ObjcRuleClasses.spawnAppleEnvActionBuilder(ruleContext, platform)
@@ -1069,12 +1069,12 @@ public final class ReleaseBundlingSupport {
             .setExecutable(attributes.swiftStdlibToolWrapper())
             .setCommandLine(commandLine.build())
             .addOutput(intermediateArtifacts.swiftFrameworksFileZip())
-            .addInput(intermediateArtifacts.combinedArchitectureBinary())
+            .addInput(combinedArchBinary)
             .build(ruleContext));
   }
 
   /** Registers an action to copy Swift standard library dylibs into SwiftSupport root directory. */
-  private void registerSwiftSupportActionsIfNecessary() {
+  private void registerSwiftSupportActionsIfNecessary(Artifact combinedArchBinary) {
     if (!objcProvider.is(USES_SWIFT)) {
       return;
     }
@@ -1085,7 +1085,7 @@ public final class ReleaseBundlingSupport {
             .add("SwiftSupport/" + platform.getLowerCaseNameInPlist())
             .add("--platform")
             .add(platform.getLowerCaseNameInPlist())
-            .addExecPath("--scan-executable", intermediateArtifacts.combinedArchitectureBinary());
+            .addExecPath("--scan-executable", combinedArchBinary);
 
     ruleContext.registerAction(
         ObjcRuleClasses.spawnAppleEnvActionBuilder(ruleContext, platform)
@@ -1093,7 +1093,7 @@ public final class ReleaseBundlingSupport {
             .setExecutable(attributes.swiftStdlibToolWrapper())
             .setCommandLine(commandLine.build())
             .addOutput(intermediateArtifacts.swiftSupportZip())
-            .addInput(intermediateArtifacts.combinedArchitectureBinary())
+            .addInput(combinedArchBinary)
             .build(ruleContext));
   }
 
@@ -1183,6 +1183,24 @@ public final class ReleaseBundlingSupport {
       return ruleContext.getExecutablePrerequisite("ipa_post_processor", Mode.TARGET);
     }
 
+    /**
+     * Returns the multi-arch binary provided by the label under the "binary" attribute of the
+     * current rule, or null if there is no such binary available.
+     */
+    @Nullable Artifact dependentMultiArchBinary() {
+      if (ruleContext.attributes().getAttributeDefinition("binary") == null) {
+        return null;
+      }
+
+      for (ObjcProvider provider
+          : ruleContext.getPrerequisites("binary", Mode.DONT_CHECK, ObjcProvider.class)) {
+        if (!provider.get(ObjcProvider.MULTI_ARCH_LINKED_BINARIES).isEmpty()) {
+          return Iterables.getOnlyElement(provider.get(ObjcProvider.MULTI_ARCH_LINKED_BINARIES));
+        }
+      }
+      return null;
+    }
+
     NestedSet<? extends Artifact> dependentLinkedBinaries() {
       if (ruleContext.attributes().getAttributeDefinition("binary") == null) {
         return NestedSetBuilder.emptySet(Order.STABLE_ORDER);