diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java index 5e670f6dd5..13c2d5476b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFramework.java @@ -16,12 +16,12 @@ package com.google.devtools.build.lib.rules.objc; import static com.google.devtools.build.lib.collect.nestedset.Order.STABLE_ORDER; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; import com.google.devtools.build.lib.rules.objc.ObjcSdkFrameworks.Attributes; @@ -50,12 +50,9 @@ public class ObjcFramework implements RuleConfiguredTargetFactory { ruleContext.attributeError("framework_imports", error); } - return common.configuredTarget( - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* filesToBuild */, - Optional.<XcodeProvider>absent(), - Optional.of(common.getObjcProvider()), - Optional.<XcTestAppProvider>absent(), - Optional.<J2ObjcSrcsProvider>absent(), - Optional.<J2ObjcMappingFileProvider>absent()); + NestedSet<Artifact> filesToBuild = NestedSetBuilder.emptySet(STABLE_ORDER); + return ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild) + .addProvider(ObjcProvider.class, common.getObjcProvider()) + .build(); } } |