diff options
author | 2018-07-26 07:46:15 -0700 | |
---|---|---|
committer | 2018-07-26 07:47:48 -0700 | |
commit | 09efb3fb5cbefe48d7c6685b01cfd72f848563c8 (patch) | |
tree | 24f28786c42e6245ff0c8f99391a645d7610d741 /src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java | |
parent | 74146fdbcc4eb0463e64588a764b22e253a405ac (diff) |
Use the path resolver when dealing with tree artifacts.
RELNOTES: None
PiperOrigin-RevId: 206157591
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java index b7ca9088e5..13ff08a65f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java @@ -181,13 +181,13 @@ class TreeArtifactValue implements SkyValue { } }; - private static void explodeDirectory(Artifact treeArtifact, + private static void explodeDirectory(Path treeArtifactPath, PathFragment pathToExplode, ImmutableSet.Builder<PathFragment> valuesBuilder) throws IOException { - for (Path subpath : treeArtifact.getPath().getRelative(pathToExplode).getDirectoryEntries()) { + for (Path subpath : treeArtifactPath.getRelative(pathToExplode).getDirectoryEntries()) { PathFragment canonicalSubpathFragment = pathToExplode.getChild(subpath.getBaseName()); if (subpath.isDirectory()) { - explodeDirectory(treeArtifact, + explodeDirectory(treeArtifactPath, pathToExplode.getChild(subpath.getBaseName()), valuesBuilder); } else if (subpath.isSymbolicLink()) { PathFragment linkTarget = subpath.readSymbolicLinkUnchecked(); @@ -229,9 +229,9 @@ class TreeArtifactValue implements SkyValue { * @throws IOException if there is any problem reading or validating outputs under the given * tree artifact. */ - static Set<PathFragment> explodeDirectory(Artifact treeArtifact) throws IOException { + static Set<PathFragment> explodeDirectory(Path treeArtifactPath) throws IOException { ImmutableSet.Builder<PathFragment> explodedDirectory = ImmutableSet.builder(); - explodeDirectory(treeArtifact, PathFragment.EMPTY_FRAGMENT, explodedDirectory); + explodeDirectory(treeArtifactPath, PathFragment.EMPTY_FRAGMENT, explodedDirectory); return explodedDirectory.build(); } } |