From 13263f7b799c31ef335078870a905210c14de80d Mon Sep 17 00:00:00 2001 From: John Cater Date: Wed, 24 May 2017 19:06:47 +0200 Subject: Add toolchains attribute to aspect. Part of #2219. Change-Id: I39ced1f3e2605154771df9424d6ed2f971820baf PiperOrigin-RevId: 157002268 --- .../google/devtools/build/lib/analysis/ConfiguredTargetFactory.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index b1ec35db8b..3e48b7a59c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java @@ -244,6 +244,9 @@ public final class ConfiguredTargetFactory { .setConfigConditions(configConditions) .setUniversalFragment(ruleClassProvider.getUniversalFragment()) .setSkylarkProvidersRegistry(ruleClassProvider.getRegisteredSkylarkProviders()) + // TODO(katre): Populate the actual selected toolchains. + .setToolchainContext( + new ToolchainContext(rule.getRuleClassObject().getRequiredToolchains(), null)) .build(); if (ruleContext.hasErrors()) { return null; @@ -350,6 +353,9 @@ public final class ConfiguredTargetFactory { .setAspectAttributes(aspect.getDefinition().getAttributes()) .setConfigConditions(configConditions) .setUniversalFragment(ruleClassProvider.getUniversalFragment()) + // TODO(katre): Populate the actual selected toolchains. + .setToolchainContext( + new ToolchainContext(aspect.getDefinition().getRequiredToolchains(), null)) .build(); if (ruleContext.hasErrors()) { return null; -- cgit v1.2.3