Skip to content

Commit 7bf8f2b

Browse files
tjgqcopybara-github
authored andcommitted
Treat RUNFILES_TREE_MARKER as a directory in BuildEvent.forArtifact().
952aabb didn't fix #28330 because `BuildEvent.forArtifact()` (sometimes?) sees a `FileArtifactValue.RUNFILES_TREE_MARKER`, not a `RunfilesProxyArtifactValue`. Fixes #28330. PiperOrigin-RevId: 884388938 Change-Id: Ic5be6a83479d5afefd4a25a5b83049a2fe7b0244
1 parent bdb4b63 commit 7bf8f2b

File tree

1 file changed

+7
-0
lines changed
  • src/main/java/com/google/devtools/build/lib/buildeventstream

1 file changed

+7
-0
lines changed

src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
package com.google.devtools.build.lib.buildeventstream;
1616

17+
import static com.google.devtools.build.lib.actions.FileArtifactValue.RUNFILES_TREE_MARKER;
18+
1719
import com.google.common.base.MoreObjects;
1820
import com.google.common.base.Objects;
1921
import com.google.common.base.Preconditions;
@@ -73,6 +75,11 @@ public boolean isOutput() {
7375
public static LocalFileType forArtifact(
7476
Artifact artifact, @Nullable FileArtifactValue metadata) {
7577
if (metadata != null) {
78+
if (metadata.equals(RUNFILES_TREE_MARKER)) {
79+
// TODO(tjgq): Remove RUNFILES_TREE_MARKER in favor of RunfilesProxyArtifactValue,
80+
// which would make this special case unnecessary.
81+
return LocalFileType.OUTPUT_DIRECTORY;
82+
}
7683
return switch (metadata.getType()) {
7784
case DIRECTORY -> LocalFileType.OUTPUT_DIRECTORY;
7885
case SYMLINK -> LocalFileType.OUTPUT_SYMLINK;

0 commit comments

Comments
 (0)