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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
index ea2a57e5d8..993113ad8c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java
@@ -125,10 +125,11 @@ public class AggregatingAttributeMapper extends AbstractAttributeMapper {
       for (Selector<?> selector : selectorList.getSelectors()) {
         for (Map.Entry<Label, ?> selectorEntry : selector.getEntries().entrySet()) {
           if (includeSelectKeys && !BuildType.Selector.isReservedLabel(selectorEntry.getKey())) {
-            observer.acceptLabelAttribute(selectorEntry.getKey(), attribute);
+            observer.acceptLabelAttribute(
+                getLabel().resolveRepositoryRelative(selectorEntry.getKey()), attribute);
           }
           for (Label value : extractLabels(type, selectorEntry.getValue())) {
-            observer.acceptLabelAttribute(value, attribute);
+            observer.acceptLabelAttribute(getLabel().resolveRepositoryRelative(value), attribute);
           }
         }
       }