commit 861751c439a563e62c11b88b92c7276ec8f7cae8
author ulfjack <ulfjack@google.com> Fri Dec 13 12:03:58 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Dec 13 12:05:00 2019 -0800
tree ee88c05ceabf25728831f7039ab79bf48cc65c25
parent bf2c4d914757fff11dd2b38b420f7067340f6249

Update JavaCompileAction to use NestedSet for inputs (part 4)

This is in preparation for making NestedSet not implement Iterable. Unfortunately, doing so means that there is no longer a common super-type for NestedSet and Collection, which means that we have to use NestedSet for all action inputs.

PiperOrigin-RevId: 285445218

src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 38d63d2..a6a784d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -54,8 +54,8 @@
 import com.google.devtools.build.lib.actions.extra.ExtraActionInfo;
 import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
-import com.google.devtools.build.lib.collect.IterablesChain;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible;
 import com.google.devtools.build.lib.events.Location;
@@ -144,7 +144,10 @@
     super(
         owner,
         tools,
-        IterablesChain.concat(mandatoryInputs, transitiveInputs),
+        NestedSetBuilder.<Artifact>stableOrder()
+            .addTransitive(mandatoryInputs)
+            .addTransitive(transitiveInputs)
+            .build(),
         runfilesSupplier,
         outputs,
         env);