1 files changed, 8 insertions, 50 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarProvider.java
index f4f16bd96f..59402defd8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarProvider.java
@@ -16,11 +16,8 @@ package com.google.devtools.build.lib.rules.android;
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 
-import java.util.Objects;
-
 /**
  * A target that can provide the aar artifact of Android libraries and all the manifests that are
  * merged into the main aar manifest.
@@ -28,58 +25,19 @@ import java.util.Objects;
 @Immutable
 public final class AndroidLibraryAarProvider implements TransitiveInfoProvider {
 
-  private final Aar aar;
-  private final NestedSet<Aar> transitiveAars;
+  private final Artifact aar;
+  private final Artifact manifest;
 
-  public AndroidLibraryAarProvider(Aar aar, NestedSet<Aar> transitiveAars) {
-    this.aar = aar;
-    this.transitiveAars = transitiveAars;
+  public AndroidLibraryAarProvider(Artifact aar, Artifact manifest) {
+    this.aar = Preconditions.checkNotNull(aar);
+    this.manifest = Preconditions.checkNotNull(manifest);
   }
 
-  public Aar getAar() {
+  public Artifact getAar() {
     return aar;
   }
 
-  public NestedSet<Aar> getTransitiveAars() {
-    return transitiveAars;
-  }
-
-  /**
-   * The .aar file and associated AndroidManifest.xml contributed by a single target.
-   */
-  @Immutable
-  public static final class Aar {
-    private final Artifact aar;
-    private final Artifact manifest;
-
-    public Aar(Artifact aar, Artifact manifest) {
-      this.aar = Preconditions.checkNotNull(aar);
-      this.manifest = Preconditions.checkNotNull(manifest);
-    }
-
-    public Artifact getAar() {
-      return aar;
-    }
-
-    public Artifact getManifest() {
-      return manifest;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(aar, manifest);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj) {
-        return true;
-      }
-      if (!(obj instanceof Aar)) {
-        return false;
-      }
-      Aar other = (Aar) obj;
-      return aar.equals(other.aar) && manifest.equals(other.manifest);
-    }
+  public Artifact getManifest() {
+    return manifest;
   }
 }