aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssets.java7
1 files changed, 6 insertions, 1 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 11ddc1bd61..2a188a41ca 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
@@ -170,7 +170,12 @@ public class AndroidAssets {
/** Convenience method to do all of asset processing - parsing and merging. */
public MergedAndroidAssets process(RuleContext ruleContext, boolean neverlink)
throws InterruptedException {
- return parse(ruleContext).merge(ruleContext, neverlink);
+ return process(ruleContext, AssetDependencies.fromRuleDeps(ruleContext, neverlink));
+ }
+
+ MergedAndroidAssets process(RuleContext ruleContext, AssetDependencies assetDeps)
+ throws InterruptedException {
+ return parse(ruleContext).merge(ruleContext, assetDeps);
}
@Override