aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/exec/BinTools.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/exec/BinTools.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/exec/BinTools.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java
index c754386c56..651fea5238 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java
@@ -23,10 +23,9 @@ import com.google.common.io.ByteStreams;
import com.google.devtools.build.lib.actions.ActionInput;
import com.google.devtools.build.lib.actions.EnvironmentalExecException;
import com.google.devtools.build.lib.actions.ExecException;
-import com.google.devtools.build.lib.actions.cache.Metadata;
+import com.google.devtools.build.lib.actions.FileArtifactValue;
import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
-import com.google.devtools.build.lib.skyframe.FileArtifactValue;
import com.google.devtools.build.lib.vfs.Dirent;
import com.google.devtools.build.lib.vfs.FileSystem.HashFunction;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -231,7 +230,7 @@ public final class BinTools {
public static final class PathActionInput implements VirtualActionInput {
private final Path path;
private final PathFragment execPath;
- private Metadata metadata;
+ private FileArtifactValue metadata;
public PathActionInput(Path path, PathFragment execPath) {
this.path = path;
@@ -253,7 +252,7 @@ public final class BinTools {
}
@Override
- public synchronized Metadata getMetadata() throws IOException {
+ public synchronized FileArtifactValue getMetadata() throws IOException {
// We intentionally delay hashing until it is necessary.
if (metadata == null) {
metadata = hash(path);
@@ -261,7 +260,7 @@ public final class BinTools {
return metadata;
}
- private static Metadata hash(Path path) throws IOException {
+ private static FileArtifactValue hash(Path path) throws IOException {
HashFunction hashFn = path.getFileSystem().getDigestFunction();
Hasher hasher = hashFn.getHash().newHasher();
int bytesCopied = 0;