diff options
| author |  Chris Parsons <cparsons@google.com> | 2015-11-09 18:17:26 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-11-10 10:23:12 +0000 |
| commit | 15099239d94f5fb94504e33f670adf71dacff48a (patch) | |
| tree | c91ff49b78452bf0bc22f6c0ddc825716bf17d4c /src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java | |
| parent | 33f819b6b67dcefbf36b4e86a0d3657bcc76cbe2 (diff) | |
Create AppleConfiguration and AppleCommandLineOptions, and move a few items of configuration over to the apple package.
This moves a small number of configuration items over. Future changes will mostly likely follow to move yet more items.
The split here is necessary as it is not only objc-related rules which require information about apple platforms and configuration -- cc rules will need this information as well to
pass appropriate args to clang.
--
MOS_MIGRATED_REVID=107396114
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java index e409170a6f..9a32299db2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.ImplicitOutputsFunction; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; +import com.google.devtools.build.lib.rules.apple.AppleConfiguration; /** * Rule definition for ios_framework. @@ -33,7 +34,7 @@ public class IosFrameworkRule implements RuleDefinition { @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { return builder - .requiresConfigurationFragments(ObjcConfiguration.class) + .requiresConfigurationFragments(ObjcConfiguration.class, AppleConfiguration.class) // TODO(blaze-team): IPA is not right here, should probably be just zipped framework bundle. .setImplicitOutputsFunction( ImplicitOutputsFunction.fromFunctions(ReleaseBundlingSupport.IPA, XcodeSupport.PBXPROJ)) |