commit 0d31014a178eef578ea4f0db4607fe723b96154c
author olaola <olaola@google.com> Fri Jul 14 10:07:50 2017 +0200
committer László Csomor <laszlocsomor@google.com> Fri Jul 14 10:53:33 2017 +0200
tree 6a21969e1f55afe81e6b8991656c21dc839a1112
parent b89b7ee3f1f8497f7e86fd90b2e0df95b7631b46

Sorting the Action output files.

PiperOrigin-RevId: 161925075

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
index 7ba5e5e..7a50e1c 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
@@ -39,6 +39,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeSet;
@@ -159,11 +160,13 @@
     Action.Builder action = Action.newBuilder();
     action.setCommandDigest(command);
     action.setInputRootDigest(inputRoot);
-    // Somewhat ugly: we rely on the stable order of outputs here for remote action caching.
+    ArrayList<String> outputPaths = new ArrayList<>();
     for (ActionInput output : outputs) {
-      // TODO: output directories should be handled here, when they are supported.
-      action.addOutputFiles(output.getExecPathString());
+      outputPaths.add(output.getExecPathString());
     }
+    Collections.sort(outputPaths);
+    // TODO: output directories should be handled here, when they are supported.
+    action.addAllOutputFiles(outputPaths);
     if (platform != null) {
       action.setPlatform(platform);
     }