Do not recurse into the convenience symlinks when evaluating the "//..." target pattern.

Apart from the tests, I also tested this manually running "bazel query //..." in a tree with convenience symlinks.

--
MOS_MIGRATED_REVID=108325454

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunction.java
index b42d9b45c8..dbbbe8cd6d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgFunction.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
@@ -38,15 +39,24 @@ import javax.annotation.Nullable;
  * "foo/subpkg".
  */
 public class RecursivePkgFunction implements SkyFunction {
+  private final BlazeDirectories directories;
+
+  public RecursivePkgFunction(BlazeDirectories directories) {
+    this.directories = directories;
+  }
 
   @Override
   public SkyValue compute(SkyKey skyKey, Environment env) {
     return new MyTraversalFunction().visitDirectory((RecursivePkgKey) skyKey.argument(), env);
   }
 
-  private static class MyTraversalFunction
+  private class MyTraversalFunction
       extends RecursiveDirectoryTraversalFunction<MyVisitor, RecursivePkgValue> {
 
+    private MyTraversalFunction() {
+      super(directories);
+    }
+
     @Override
     protected RecursivePkgValue getEmptyReturn() {
       return RecursivePkgValue.EMPTY;