From 4be631ec58ad8aacec12c7bca76865ee63eb5669 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Fri, 29 Jan 2016 22:27:40 +0000 Subject: Redesign xcode_config rule to be evaluated at the level of configuration instead of target depss -- MOS_MIGRATED_REVID=113398355 --- .../java/com/google/devtools/build/lib/rules/objc/TestSupport.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java') 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, TransitiveInfoProvider> getExtraProviders() { AppleConfiguration configuration = ruleContext.getFragment(AppleConfiguration.class); - XcodeConfigProvider xcodeConfigProvider = - ruleContext.getPrerequisite(":xcode_config", Mode.HOST, XcodeConfigProvider.class); ImmutableMap.Builder 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", -- cgit v1.2.3