Independently parse assets

This is the first step in processing assets completely seperately from resources.

RELNOTES: none
PiperOrigin-RevId: 193076991

4 files changed, 106 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);
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
index 3a6c71f1ee..a3bd4773d6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
@@ -205,6 +205,13 @@ public class AndroidResourceParsingActionBuilder {
         androidResources, output, compiledSymbols, ruleContext.getLabel(), manifest);
   }
 
+  public ParsedAndroidAssets build(AndroidAssets assets) {
+    setAssets(assets);
+    build(ruleContext);
+
+    return ParsedAndroidAssets.of(assets, output, ruleContext.getLabel());
+  }
+
   /**
    * Builds and registers the action, and updates the given resourceContainer with the output
    * symbols.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 72395e1d81..433fc7f562 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -136,6 +136,8 @@ public final class AndroidRuleClasses {
       fromTemplates("%{name}_symbols/local.bin");
   public static final SafeImplicitOutputsFunction ANDROID_MERGED_SYMBOLS =
       fromTemplates("%{name}_symbols/merged.bin");
+  public static final SafeImplicitOutputsFunction ANDROID_ASSET_SYMBOLS =
+      fromTemplates("%{name}_symbols/assets.bin");
   public static final SafeImplicitOutputsFunction ANDROID_COMPILED_SYMBOLS =
       fromTemplates("%{name}_symbols/symbols.zip");
   public static final SafeImplicitOutputsFunction ANDROID_SYMLINKED_MANIFEST =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
new file mode 100644
index 0000000000..6a83642483
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
@@ -0,0 +1,67 @@
+// Copyright 2018 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.rules.android;
+
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.RuleContext;
+import com.google.devtools.build.lib.cmdline.Label;
+import java.util.Objects;
+
+/** Parsed Android assets which can be merged together with assets from dependencies. */
+public class ParsedAndroidAssets extends AndroidAssets implements MergableAndroidData {
+  private final Artifact symbols;
+  private final Label label;
+
+  public static ParsedAndroidAssets parseFrom(RuleContext ruleContext, AndroidAssets assets)
+      throws InterruptedException {
+    return new AndroidResourceParsingActionBuilder(ruleContext)
+        .setOutput(ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_ASSET_SYMBOLS))
+        .build(assets);
+  }
+
+  public static ParsedAndroidAssets of(AndroidAssets assets, Artifact symbols, Label label) {
+    return new ParsedAndroidAssets(assets, symbols, label);
+  }
+
+  private ParsedAndroidAssets(AndroidAssets other, Artifact symbols, Label label) {
+    super(other);
+    this.symbols = symbols;
+    this.label = label;
+  }
+
+  @Override
+  public Label getLabel() {
+    return label;
+  }
+
+  @Override
+  public Artifact getSymbols() {
+    return symbols;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    if (!super.equals(object)) {
+      return false;
+    }
+
+    ParsedAndroidAssets other = (ParsedAndroidAssets) object;
+    return symbols.equals(other.symbols) && label.equals(other.label);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), symbols, label);
+  }
+}