commit 8c214fd2560e5eb6cc61742928ed23c2297e2659
author ulfjack <ulfjack@google.com> Mon Apr 29 05:02:54 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 29 05:04:08 2019 -0700
tree a54ddb524955e1a61da1bf7fcdd867ca3172341d
parent eb8cfc14a485c3dfbd3a2c592308722dfe0f5e01

Allow modules to set the local file type for logs

PiperOrigin-RevId: 245726592

src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java
index 1045edc..8eac1f2 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java
@@ -19,7 +19,9 @@
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
+import com.google.devtools.build.lib.buildeventstream.BuildEvent.LocalFile.LocalFileType;
 import com.google.devtools.build.lib.buildeventstream.BuildToolLogs;
+import com.google.devtools.build.lib.buildeventstream.BuildToolLogs.LogFileEntry;
 import com.google.devtools.build.lib.skyframe.AspectValue;
 import com.google.devtools.build.lib.util.ExitCode;
 import com.google.devtools.build.lib.util.Pair;
@@ -280,7 +282,7 @@
   public static final class BuildToolLogCollection {
     private final List<Pair<String, ByteString>> directValues = new ArrayList<>();
     private final List<Pair<String, String>> directUris = new ArrayList<>();
-    private final List<Pair<String, Path>> localFiles = new ArrayList<>();
+    private final List<LogFileEntry> localFiles = new ArrayList<>();
     private boolean frozen;
 
     public BuildToolLogCollection freeze() {
@@ -289,7 +291,7 @@
     }
 
     @VisibleForTesting
-    public List<Pair<String, Path>> getLocalFiles() {
+    public List<LogFileEntry> getLocalFiles() {
       return localFiles;
     }
 
@@ -306,8 +308,13 @@
     }
 
     public BuildToolLogCollection addLocalFile(String name, Path path) {
+      return addLocalFile(name, path, LocalFileType.LOG);
+    }
+
+    public BuildToolLogCollection addLocalFile(
+        String name, Path path, LocalFileType localFileType) {
       Preconditions.checkState(!frozen);
-      this.localFiles.add(Pair.of(name, path));
+      this.localFiles.add(new LogFileEntry(name, path, localFileType));
       return this;
     }