diff options
| author |  John Cater <jcater@google.com> | 2018-06-22 14:20:22 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-22 14:22:15 -0700 |
| commit | c8bd74f76c3e02657571432d2fe4d923803410be (patch) | |
| tree | c4cf818a9e8d9bd4723c830331311697b8aaeae5 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | 368bc8ac6080cfce5933ef7ff5d566619bb93add (diff) | |
ToolchainContext directly implements SkylarkValue and SkylarkIndexable.
Change-Id: I355b138e143771fd826ab03951df821ea7d58ac5
PiperOrigin-RevId: 201740564
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java b/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java index 0139ddfade..1d0c229d88 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java +++ b/src/main/java/com/google/devtools/build/lib/rules/ToolchainType.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.TemplateVariableInfo; -import com.google.devtools.build.lib.analysis.ToolchainContext.ResolvedToolchainProviders; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options; @@ -80,10 +79,8 @@ public class ToolchainType implements RuleConfiguredTargetFactory { && ruleContext .getFragment(PlatformConfiguration.class) .isToolchainTypeEnabled(ruleContext.getLabel())) { - ResolvedToolchainProviders providers = - (ResolvedToolchainProviders) - ruleContext.getToolchainContext().getResolvedToolchainProviders(); - ToolchainInfo toolchainInfo = providers.getForToolchainType(ruleContext.getLabel()); + ToolchainInfo toolchainInfo = + ruleContext.getToolchainContext().forToolchainType(ruleContext.getLabel()); if (toolchainInfo != null) { toolchainInfo.addGlobalMakeVariables(fragmentBuilder); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index c1191850f8..63a94cf5f7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.analysis.PlatformConfiguration; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.StaticallyLinkedMarkerProvider; -import com.google.devtools.build.lib.analysis.ToolchainContext.ResolvedToolchainProviders; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; @@ -455,10 +454,7 @@ public class CppHelper { private static CcToolchainProvider getToolchainFromPlatformConstraints( RuleContext ruleContext, Label toolchainType) { - ResolvedToolchainProviders providers = - (ResolvedToolchainProviders) - ruleContext.getToolchainContext().getResolvedToolchainProviders(); - return (CcToolchainProvider) providers.getForToolchainType(toolchainType); + return (CcToolchainProvider) ruleContext.getToolchainContext().forToolchainType(toolchainType); } private static CcToolchainProvider getToolchainFromCrosstoolTop( |