commit 73d952d61068eb24506ad382ffd09031358e7700
author Googler <cmita@google.com> Thu Apr 25 06:03:34 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 25 06:05:35 2024 -0700
tree 8cd25b508ee0ebaa1e548c959de625fa326c194c
parent 8ef7b705bb33de6ee9025c01bdf65a23f73926e3

Changes to Fileset traversal code for internal purposes

PiperOrigin-RevId: 628050248
Change-Id: I6fe26e0ff97793bda74fa884663ddbc0bdf06df1

src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
index 0191593..ecdbbd9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
@@ -110,8 +110,7 @@
     PathFragment prefixToRemove = direct.getRoot().getRelativePart();
 
     Iterable<ResolvedFile> results;
-    if (direct.isRecursive()
-        || (resolvedRoot.getType().isDirectory() && !resolvedRoot.getType().isSymlink())) {
+    if (resolvedRoot.getType().isDirectory() && !resolvedRoot.getType().isSymlink()) {
       // The traversal is recursive (requested for an entire FilesetEntry.srcdir) or it was
       // requested for a FilesetEntry.files entry which turned out to be a directory. We need to
       // create an output symlink for every file in it and all of its subdirectories. Only