diff options
| author |  Cal Peyser <cpeyser@google.com> | 2016-08-31 14:40:18 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-08-31 14:52:17 +0000 |
| commit | d82f4a568df7bdc71e5eda53249b05046a4ac43a (patch) | |
| tree | d1b9023a12ce3e30e3fc1e3aa4d1f34604362dd2 /src/main/java/com/google/devtools | |
| parent | 351ffaa050aaeb12d5a3fb01889e1d33c1e32a8e (diff) | |
Add resource support to experimental_objc_library.
--
MOS_MIGRATED_REVID=131827507
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java index da0f88f76c..df70a76789 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java @@ -125,6 +125,11 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory { XcodeProvider.Builder xcodeProviderBuilder = new XcodeProvider.Builder(); compilationSupport.addXcodeSettings(xcodeProviderBuilder, common); + + new ResourceSupport(ruleContext) + .validateAttributes() + .addXcodeSettings(xcodeProviderBuilder); + new XcodeSupport(ruleContext) .addFilesToBuild(filesToBuild) .addXcodeSettings(xcodeProviderBuilder, common.getObjcProvider(), LIBRARY_STATIC) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java index d0f3141df3..e259875e9a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java @@ -57,7 +57,8 @@ public class ObjcXcodeprojRule implements RuleDefinition { "ios_test", "objc_bundle_library", "objc_import", - "objc_library") + "objc_library", + "experimental_objc_library") .allowedFileTypes()) .override(attr("testonly", BOOLEAN) .nonconfigurable("Must support test deps.") |