aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java10
1 files changed, 10 insertions, 0 deletions
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
index 6a83642483..3419ceeca5 100644
--- 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
@@ -34,12 +34,22 @@ public class ParsedAndroidAssets extends AndroidAssets implements MergableAndroi
return new ParsedAndroidAssets(assets, symbols, label);
}
+ ParsedAndroidAssets(ParsedAndroidAssets other) {
+ this(other, other.symbols, other.label);
+ }
+
private ParsedAndroidAssets(AndroidAssets other, Artifact symbols, Label label) {
super(other);
this.symbols = symbols;
this.label = label;
}
+ /** Merges these assets with assets from dependencies. */
+ public MergedAndroidAssets merge(RuleContext ruleContext, boolean neverlink)
+ throws InterruptedException {
+ return MergedAndroidAssets.mergeFrom(ruleContext, this, neverlink);
+ }
+
@Override
public Label getLabel() {
return label;