diff options
author | 2016-07-28 18:26:25 +0000 | |
---|---|---|
committer | 2016-07-29 10:11:12 +0000 | |
commit | 0e5b8b76595380fd3fa9e91e8f476917eecdb59b (patch) | |
tree | f459ed8d5d35f2070321858c990f84eb77769140 /src/main/java/com/google/devtools | |
parent | 7c38828e8cbca27e884db87bf80eda699f8527e4 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | 11 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java | 10 |
2 files changed, 1 insertions, 20 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 = diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java index e69834d2f3..f6b5c141e2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java @@ -46,12 +46,6 @@ public class AppleBinaryRule implements RuleDefinition { * multiple architectures). */ private static final SafeImplicitOutputsFunction LIPOBIN = fromTemplates("%{name}_lipobin"); - - /** - * Template for the fat archive output (using Apple's "lipo" tool to combine .a archive files of - * multiple architectures). - */ - static final SafeImplicitOutputsFunction LIPO_ARCHIVE = fromTemplates("%{name}_lipo.a"); @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { @@ -90,12 +84,10 @@ public class AppleBinaryRule implements RuleDefinition { <ul> <li><code><var>name</var>_lipobin</code>: the 'lipo'ed potentially multi-architecture binary. All transitive dependencies and <code>srcs</code> are linked.</li> - <li><code><var>name</var>_.lipo.a</code>: a 'lipo'ed archive file linking together only - the <code>srcs</code> of this target.</li> </ul> <!-- #END_BLAZE_RULE.IMPLICIT_OUTPUTS -->*/ .setImplicitOutputsFunction( - ImplicitOutputsFunction.fromFunctions(LIPOBIN, LIPO_ARCHIVE)) + ImplicitOutputsFunction.fromFunctions(LIPOBIN)) .build(); } |