Redesign xcode_config rule to be evaluated at the level of configuration instead of target depss

--
MOS_MIGRATED_REVID=113398355

2 files changed, 2 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 99c880f8b6..23acbd12ad 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -53,7 +53,6 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain.RequiresXcodeConfigRule;
 import com.google.devtools.build.lib.rules.apple.DottedVersion;
 import com.google.devtools.build.lib.rules.apple.Platform;
-import com.google.devtools.build.lib.rules.apple.XcodeConfigProvider;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.util.FileTypeSet;
@@ -165,12 +164,10 @@ public class ObjcRuleClasses {
    */
   static SpawnAction.Builder spawnXcrunActionBuilder(RuleContext ruleContext) {
     AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class);
-    XcodeConfigProvider xcodeConfigProvider =
-        ruleContext.getPrerequisite(":xcode_config", Mode.HOST, XcodeConfigProvider.class);
 
     ImmutableMap.Builder<String, String> envBuilder = ImmutableMap.<String, String>builder()
         .putAll(appleConfiguration.getEnvironmentForIosAction())
-        .putAll(AppleToolchain.appleHostSystemEnv(xcodeConfigProvider));
+        .putAll(appleConfiguration.getAppleHostSystemEnv());
 
     return spawnOnDarwinActionBuilder()
         .setEnvironment(envBuilder.build());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
index aca9e11dd5..ce49995630 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
@@ -32,8 +32,6 @@ import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Su
 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.apple.AppleConfiguration;
-import com.google.devtools.build.lib.rules.apple.AppleToolchain;
-import com.google.devtools.build.lib.rules.apple.XcodeConfigProvider;
 import com.google.devtools.build.lib.rules.test.TestEnvironmentProvider;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileType;
@@ -234,13 +232,11 @@ public class TestSupport {
    */
   public Map<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> getExtraProviders() {
     AppleConfiguration configuration = ruleContext.getFragment(AppleConfiguration.class);
-    XcodeConfigProvider xcodeConfigProvider =
-        ruleContext.getPrerequisite(":xcode_config", Mode.HOST, XcodeConfigProvider.class);
 
     ImmutableMap.Builder<String, String> envBuilder = ImmutableMap.builder();
 
     envBuilder.putAll(configuration.getEnvironmentForIosAction());
-    envBuilder.putAll(AppleToolchain.appleHostSystemEnv(xcodeConfigProvider));
+    envBuilder.putAll(configuration.getAppleHostSystemEnv());
 
     if (ruleContext.getConfiguration().isCodeCoverageEnabled()) {
       envBuilder.put("COVERAGE_GCOV_PATH",