diff options
author | 2016-05-27 19:35:59 +0000 | |
---|---|---|
committer | 2016-05-30 09:20:33 +0000 | |
commit | adccc11325f0b11307e1c0eace89b85032a95bdc (patch) | |
tree | c270128f06eaad5f9eb95e3e9547b2df8fd216b2 /src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java | |
parent | 0f4927f30a1ab99ebdc9d41df708800d73a76adf (diff) |
Refactoring of Apple Platform detection and usage, to pave the way for non-IOS Platforms.
There are still various places which infer IOS platform type which need to be fixed, but this ensures switching to other platform types is as easy as changing an argument.
--
MOS_MIGRATED_REVID=123444548
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 | 4 |
1 files changed, 2 insertions, 2 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 690207b3ab..bc26cf74ed 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 @@ -142,11 +142,11 @@ public class AppleBinary implements RuleConfiguredTargetFactory { .registerCombineArchitecturesAction( binariesToLipo.build(), ruleIntermediateArtifacts.combinedArchitectureBinary(), - appleConfiguration.getIosCpuPlatform()) + appleConfiguration.getPlatform(PlatformType.IOS)) .registerCombineArchitecturesAction( archivesToLipo.build(), ruleContext.getImplicitOutputArtifact(AppleBinaryRule.LIPO_ARCHIVE), - appleConfiguration.getIosCpuPlatform()); + appleConfiguration.getPlatform(PlatformType.IOS)); RuleConfiguredTargetBuilder targetBuilder = ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild.build()); |