From 64cf9807b92dabb94b6ef6aa3acabb767d626ca2 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Mon, 27 Jan 2014 16:08:28 -0800
Subject: [PATCH] Allow multiple asset directories in aapt

AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
---
 core/package.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/package.mk b/core/package.mk
index 56f2dab4f..a30e42165 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -95,8 +95,14 @@ package_resource_overlays := $(strip \
 
 LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
 
-all_assets := $(call find-subdir-assets,$(LOCAL_ASSET_DIR))
-all_assets := $(addprefix $(LOCAL_ASSET_DIR)/,$(patsubst assets/%,%,$(all_assets)))
+all_assets := $(strip \
+    $(foreach dir, $(LOCAL_ASSET_DIR), \
+      $(addprefix $(dir)/, \
+        $(patsubst assets/%,%, \
+          $(call find-subdir-assets, $(dir)) \
+         ) \
+       ) \
+     ))
 
 all_resources := $(strip \
     $(foreach dir, $(LOCAL_RESOURCE_DIR), \
-- 
2.11.0