Rollforward of change that broke #1579 with test fix (need to specify ios_sdk_version and xcode_version for our CI macs)

*** Original change description ***

Remove apple_binary's implicit output _lipo.a.

This also removes the restriction that apple_binary targets must have at least one src file specified.

--
MOS_MIGRATED_REVID=128721251

1 files changed, 0 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
index 017d245b81..77b659ff01 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
@@ -88,8 +88,6 @@ public class AppleBinary implements RuleConfiguredTargetFactory {
 
     NestedSetBuilder<Artifact> binariesToLipo =
         NestedSetBuilder.<Artifact>stableOrder();
-    NestedSetBuilder<Artifact> archivesToLipo =
-        NestedSetBuilder.<Artifact>stableOrder();
     NestedSetBuilder<Artifact> filesToBuild =
         NestedSetBuilder.<Artifact>stableOrder()
             .add(ruleIntermediateArtifacts.combinedArchitectureBinary());
@@ -117,11 +115,6 @@ public class AppleBinary implements RuleConfiguredTargetFactory {
           J2ObjcMappingFileProvider.union(j2ObjcMappingFileProviders.build());
       J2ObjcEntryClassProvider j2ObjcEntryClassProvider = j2ObjcEntryClassProviderBuilder.build();
 
-      if (!common.getCompilationArtifacts().get().getArchive().isPresent()) {
-        ruleContext.throwWithRuleError(REQUIRES_AT_LEAST_ONE_SOURCE_FILE);
-      }
-
-      archivesToLipo.add(common.getCompilationArtifacts().get().getArchive().get());
       binariesToLipo.add(intermediateArtifacts.strippedSingleArchitectureBinary());
 
       ObjcConfiguration objcConfiguration = childConfig.getFragment(ObjcConfiguration.class);
@@ -156,10 +149,6 @@ public class AppleBinary implements RuleConfiguredTargetFactory {
         .registerCombineArchitecturesAction(
             binariesToLipo.build(),
             ruleIntermediateArtifacts.combinedArchitectureBinary(),
-            appleConfiguration.getMultiArchPlatform(platformType))
-        .registerCombineArchitecturesAction(
-            archivesToLipo.build(),
-            ruleContext.getImplicitOutputArtifact(AppleBinaryRule.LIPO_ARCHIVE),
             appleConfiguration.getMultiArchPlatform(platformType));
 
     RuleConfiguredTargetBuilder targetBuilder =