From 3851667a8454d891eb031c00fe6d07244b6e606d Mon Sep 17 00:00:00 2001
From: asteinb <asteinb@google.com>
Date: Thu, 3 May 2018 09:50:44 -0700
Subject: Expose merge_assets method to skylark

RELNOTES: none
PiperOrigin-RevId: 195266230
---
 .../devtools/build/lib/rules/android/AssetDependencies.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AssetDependencies.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AssetDependencies.java b/src/main/java/com/google/devtools/build/lib/rules/android/AssetDependencies.java
index ef088993a8..cc9c8dc5ae 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AssetDependencies.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AssetDependencies.java
@@ -39,14 +39,19 @@ public class AssetDependencies {
   private final NestedSet<Artifact> transitiveSymbols;
 
   static AssetDependencies fromRuleDeps(RuleContext ruleContext, boolean neverlink) {
+    return fromProviders(
+        AndroidCommon.getTransitivePrerequisites(
+            ruleContext, Mode.TARGET, AndroidAssetsInfo.PROVIDER),
+        neverlink);
+  }
+
+  static AssetDependencies fromProviders(Iterable<AndroidAssetsInfo> providers, boolean neverlink) {
     NestedSetBuilder<ParsedAndroidAssets> direct = NestedSetBuilder.naiveLinkOrder();
     NestedSetBuilder<ParsedAndroidAssets> transitive = NestedSetBuilder.naiveLinkOrder();
     NestedSetBuilder<Artifact> assets = NestedSetBuilder.naiveLinkOrder();
     NestedSetBuilder<Artifact> symbols = NestedSetBuilder.naiveLinkOrder();
 
-    for (AndroidAssetsInfo info :
-        AndroidCommon.getTransitivePrerequisites(
-            ruleContext, Mode.TARGET, AndroidAssetsInfo.PROVIDER)) {
+    for (AndroidAssetsInfo info : providers) {
       direct.addTransitive(info.getDirectParsedAssets());
       transitive.addTransitive(info.getTransitiveParsedAssets());
       assets.addTransitive(info.getAssets());
-- 
cgit v1.2.3