commit a88755c14fe9947245c987dfd2f2aa561430561a
author Lukacs Berki <lberki@google.com> Fri Jan 22 16:40:37 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Jan 25 16:50:38 2016 +0000
tree 87ce2390ce24fb97e72b3d8458799b4f8ecbdfd3
parent 4fdd66db55d36c923b1e9fa30a158e1596408670

Make select() statements in remote repositories with selector labels pointing back to the main repository ("@//:...") work.

In principle, we should just use main repository labels instead of default repository labels in all the SkyKeys that take labels. @bsilver8192 is working on it, but in the meantime, this will serve to unblock @chin33z.

Fixes #811.

--
MOS_MIGRATED_REVID=112787545

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 92ea112..137aeb8 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -1487,9 +1487,7 @@
     for (Attribute attr : rule.getAttributes()) {
       SelectorList<?> selectors = attributes.getSelectorList(attr.getName(), attr.getType());
       if (selectors != null) {
-        for (Label key : selectors.getKeyLabels()) {
-          configLabels.add(rule.getLabel().resolveRepositoryRelative(key));
-        }
+        configLabels.addAll(selectors.getKeyLabels());
       }
     }