diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-09-29 21:55:45 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-30 08:15:01 +0000 |
| commit | 1eac7e8195158a1b88dd6d1f11e5690ec387e077 (patch) | |
| tree | dd8082c264e969c6f84ec5d10c6f89cccc29df1a /src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java | |
| parent | 29dc3f7dabc24f9e032ffc3602c0f928babdf1ad (diff) | |
Use minimum OS flags for watchOS and tvOS actions.
Also:
- Move minimum os information into AppleConfiguration
- Update watchos and tvos minimum version defaulting behavior
such that, if unspecified in flags, the minimum OS is equal
to the SDK version.
- Expose Apple Platform to apple_common in skylark
--
MOS_MIGRATED_REVID=134712763
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java index be3e6639ba..b1c4389202 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTest.java @@ -163,14 +163,13 @@ public final class IosTest implements RuleConfiguredTargetFactory { .addXcodeSettings(xcodeProviderBuilder, common) .validateAttributes(); - ObjcConfiguration objcConfiguration = ObjcRuleClasses.objcConfiguration(ruleContext); AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class); new ReleaseBundlingSupport( ruleContext, common.getObjcProvider(), LinkedBinary.LOCAL_AND_DEPENDENCIES, bundleFormat, - objcConfiguration.getMinimumOs(), + appleConfiguration.getMinimumOsForPlatformType(PlatformType.IOS), appleConfiguration.getMultiArchPlatform(PlatformType.IOS)) .registerActions(DsymOutputType.TEST) .addXcodeSettings(xcodeProviderBuilder) |