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, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
index e7d487fb4f..e1f3105280 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryFunction.java
@@ -18,6 +18,7 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 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.cmdline.ResolvedTargets;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
@@ -48,6 +49,11 @@ import javax.annotation.Nullable;
  * subdirectories.
  */
 public class PrepareDepsOfTargetsUnderDirectoryFunction implements SkyFunction {
+  private final BlazeDirectories directories;
+
+  public PrepareDepsOfTargetsUnderDirectoryFunction(BlazeDirectories directories) {
+    this.directories = directories;
+  }
 
   @Override
   public SkyValue compute(SkyKey skyKey, Environment env) {
@@ -58,13 +64,14 @@ public class PrepareDepsOfTargetsUnderDirectoryFunction implements SkyFunction {
     return new MyTraversalFunction(filteringPolicy).visitDirectory(recursivePkgKey, env);
   }
 
-  private static class MyTraversalFunction
+  private class MyTraversalFunction
       extends RecursiveDirectoryTraversalFunction<MyVisitor,
       PrepareDepsOfTargetsUnderDirectoryValue> {
 
     private final FilteringPolicy filteringPolicy;
 
     private MyTraversalFunction(FilteringPolicy filteringPolicy) {
+      super(directories);
       this.filteringPolicy = filteringPolicy;
     }