1 files changed, 30 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java
index ffed91b2ae..f7e0273694 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
@@ -24,9 +25,10 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import java.util.Objects;
 
 /** Wraps this target's Android assets */
-public final class AndroidAssets {
+public class AndroidAssets {
   private static final String ASSETS_ATTR = "assets";
   private static final String ASSETS_DIR_ATTR = "assets_dir";
 
@@ -64,7 +66,8 @@ public final class AndroidAssets {
           PathFragment path = file.getExecPath();
           assetRoots.add(path.subFragment(0, path.segmentCount() - relativePath.segmentCount()));
         } else {
-          ruleContext.attributeError(ASSETS_ATTR,
+          ruleContext.attributeError(
+              ASSETS_ATTR,
               String.format(
                   "'%s' (generated by '%s') is not beneath '%s'",
                   file.getRootRelativePath(), target.getLabel(), assetsDir));
@@ -103,7 +106,12 @@ public final class AndroidAssets {
   private final ImmutableList<Artifact> assets;
   private final ImmutableList<PathFragment> assetRoots;
 
-  private AndroidAssets(ImmutableList<Artifact> assets, ImmutableList<PathFragment> assetRoots) {
+  AndroidAssets(AndroidAssets other) {
+    this(other.assets, other.assetRoots);
+  }
+
+  @VisibleForTesting
+  AndroidAssets(ImmutableList<Artifact> assets, ImmutableList<PathFragment> assetRoots) {
     this.assets = assets;
     this.assetRoots = assetRoots;
   }
@@ -115,4 +123,23 @@ public final class AndroidAssets {
   public ImmutableList<PathFragment> getAssetRoots() {
     return assetRoots;
   }
+
+  public ParsedAndroidAssets parse(RuleContext ruleContext) throws InterruptedException {
+    return ParsedAndroidAssets.parseFrom(ruleContext, this);
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    if (object == null || getClass() != object.getClass()) {
+      return false;
+    }
+
+    AndroidAssets other = (AndroidAssets) object;
+    return assets.equals(other.assets) && assetRoots.equals(other.assetRoots);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(assets, assetRoots);
+  }
 }