Remove some cases of inferring configuration and platform from ruleContext outside of rule implementation.

--
PiperOrigin-RevId: 143720112
MOS_MIGRATED_REVID=143720112

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibrary.java
index b8f691cf94..c7ae890d47 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibrary.java
@@ -24,14 +24,15 @@ 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.NestedSetBuilder;
-import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
 import com.google.devtools.build.lib.rules.apple.Platform.PlatformType;
+import com.google.devtools.build.lib.rules.objc.BundleSupport.ExtraActoolArgs;
 import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes;
 import com.google.devtools.build.lib.rules.objc.TargetDeviceFamily.InvalidFamilyNameException;
 import com.google.devtools.build.lib.rules.objc.TargetDeviceFamily.RepeatedFamilyNameException;
 import com.google.devtools.build.lib.syntax.Type;
+
 import java.util.List;
 
 /**
@@ -56,7 +57,12 @@ public class ObjcBundleLibrary implements RuleConfiguredTargetFactory {
       return null;
     }
 
-    new BundleSupport(ruleContext, bundling)
+    AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class);
+    new BundleSupport(ruleContext,
+            appleConfiguration,
+            appleConfiguration.getMultiArchPlatform(PlatformType.IOS),
+            bundling,
+            new ExtraActoolArgs())
         .registerActions(common.getObjcProvider())
         .validate(common.getObjcProvider())
         .addXcodeSettings(xcodeProviderBuilder);