Dedupe Jar files produced for Android binary targets for desugaring purposes.

--
MOS_MIGRATED_REVID=137305868

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 15f76726dd..3f4c1b47fc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -125,7 +125,7 @@ public class AndroidCommon {
   private JavaCompilationArgs javaCompilationArgs = JavaCompilationArgs.EMPTY_ARGS;
   private JavaCompilationArgs recursiveJavaCompilationArgs = JavaCompilationArgs.EMPTY_ARGS;
   private JackCompilationHelper jackCompilationHelper;
-  private ImmutableList<Artifact> jarsProducedForRuntime;
+  private NestedSet<Artifact> jarsProducedForRuntime;
   private Artifact classJar;
   private Artifact iJar;
   private Artifact srcJar;
@@ -398,7 +398,7 @@ public class AndroidCommon {
       JavaCompilationArtifacts.Builder artifactsBuilder,
       JavaTargetAttributes.Builder attributes,
       NestedSetBuilder<Artifact> filesBuilder,
-      ImmutableList.Builder<Artifact> jarsProducedForRuntime,
+      NestedSetBuilder<Artifact> jarsProducedForRuntime,
       boolean useRClassGenerator) throws InterruptedException {
     compileResourceJar(javaSemantics, resourceApk, resourcesJar, useRClassGenerator);
     // Add the compiled resource jar to the classpath of the main compilation.
@@ -462,7 +462,7 @@ public class AndroidCommon {
 
   private void createJarJarActions(
       JavaTargetAttributes.Builder attributes,
-      ImmutableList.Builder<Artifact> jarsProducedForRuntime,
+      NestedSetBuilder<Artifact> jarsProducedForRuntime,
       Iterable<ResourceContainer> resourceContainers,
       String originalPackage,
       Artifact binaryResourcesJar) {
@@ -550,7 +550,7 @@ public class AndroidCommon {
             .setBootClassPath(bootclasspath);
 
     JavaCompilationArtifacts.Builder artifactsBuilder = new JavaCompilationArtifacts.Builder();
-    ImmutableList.Builder<Artifact> jarsProducedForRuntime = ImmutableList.builder();
+    NestedSetBuilder<Artifact> jarsProducedForRuntime = NestedSetBuilder.<Artifact>stableOrder();
     NestedSetBuilder<Artifact> filesBuilder = NestedSetBuilder.<Artifact>stableOrder();
 
     Artifact resourcesJar = resourceApk.getResourceJavaSrcJar();
@@ -905,7 +905,7 @@ public class AndroidCommon {
    * {@link #getRuntimeJars()} returns the complete runtime classpath needed by this rule, including
    * dependencies.
    */
-  public ImmutableList<Artifact> getJarsProducedForRuntime() {
+  public NestedSet<Artifact> getJarsProducedForRuntime() {
     return jarsProducedForRuntime;
   }