Simplify ConfiguredTarget construction.

This is part of a series of changes to reduce/remove ObjcCommon. In this
case removing a method that added needless complexity.

--
MOS_MIGRATED_REVID=93573019

1 files changed, 5 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundle.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundle.java
index 7eb806c1a5..4a4d34d994 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundle.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundle.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;
 
@@ -41,12 +41,9 @@ public class ObjcBundle implements RuleConfiguredTargetFactory {
       ruleContext.attributeError("bundle_imports", error);
     }
 
-    return common.configuredTarget(
-        /*filesToBuild=*/NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER),
-        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();
   }
 }