diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-07-27 22:01:23 +0000 |
|---|---|---|
| committer |  Adam Michael <ajmichael@google.com> | 2016-07-28 18:36:30 -0400 |
| commit | 8643954b818547339e8055d0aa4867c1286ebca1 (patch) | |
| tree | 6160c6529d9f9a743d7f437d9276be972080f41c /src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | |
| parent | 47281b4a1e3be5077e13f5d2d1986c6105c26365 (diff) | |
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=128633173
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | 11 |
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 = |