From fc2a01bcedaf85c2a4fd7675f80e877203cc57cb Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Thu, 14 Jan 2016 11:56:32 +0000 Subject: Add a few other Label.resolveRepositoryRelative() calls to make select() statements work in remote repositories. This work is somewhat sisyphean; the principled thing to do would be to just do this resolution when labels are parsed. Fixes #783. -- MOS_MIGRATED_REVID=112137996 --- .../google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java index bd698d9cb8..70d72331e5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java @@ -645,7 +645,8 @@ final class ConfiguredTargetFunction implements SkyFunction { for (Label configLabel : attributeMap.getConfigurabilityKeys(a.getName(), a.getType())) { if (!BuildType.Selector.isReservedLabel(configLabel)) { configLabelMap.put(a, LabelAndConfiguration.of( - configLabel, ctgValue.getConfiguration())); + target.getLabel().resolveRepositoryRelative(configLabel), + ctgValue.getConfiguration())); } } } -- cgit v1.2.3