1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
index e1c877f455..e233cdfdd5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
@@ -90,7 +90,8 @@ public final class GlobFunction implements SkyFunction {
     // "**" also matches an empty segment, so try the case where it is not present.
     if ("**".equals(patternHead)) {
       if (patternTail == null) {
-        if (!glob.excludeDirs()) {
+        // Recursive globs aren't supposed to match the package's directory.
+        if (!glob.excludeDirs() && !globSubdir.equals(PathFragment.EMPTY_FRAGMENT)) {
           matches.add(globSubdir);
         }
       } else {