commit 64cf9807b92dabb94b6ef6aa3acabb767d626ca2
author Adam Lesinski <adamlesinski@google.com> Mon Jan 27 16:08:28 2014 -0800
committer Adam Lesinski <adamlesinski@google.com> Wed Feb 05 00:13:58 2014 +0000
tree 6de151c91135dfb040a55be98f5f0b82978de096
parent 17657ec7f71a7be5c71f3b42b217d9ec45079f3b

Allow multiple asset directories in aapt

AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 56f2dab..a30e421 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -95,8 +95,14 @@
 
 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), \