1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
index 44b08e07ae..eddaa71b25 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
@@ -125,7 +125,12 @@ public class ParsedAndroidResources extends AndroidResources
   /** Merges this target's resources with resources from dependencies. */
   public MergedAndroidResources merge(RuleContext ruleContext, boolean neverlink)
       throws InterruptedException, RuleErrorException {
-    return MergedAndroidResources.mergeFrom(ruleContext, this, neverlink);
+    return merge(ruleContext, ResourceDependencies.fromRuleDeps(ruleContext, neverlink));
+  }
+
+  MergedAndroidResources merge(RuleContext ruleContext, ResourceDependencies resourceDeps)
+      throws InterruptedException, RuleErrorException {
+    return MergedAndroidResources.mergeFrom(ruleContext, this, resourceDeps);
   }
 
   @Override