commit 7b734fd8d163f7a71254b909fbbcd358129924b7
author Adam Lesinski <adamlesinski@google.com> Wed Feb 05 00:46:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 05 00:47:00 2014 +0000
tree fb9154fb40382524a49e6a93ceba7b7fdd32e5ae
parent 303d275591a4a73ac0a6ca49f4396f6a0d994095
parent 64cf9807b92dabb94b6ef6aa3acabb767d626ca2

Merge "Allow multiple asset directories in aapt" into klp-modular-dev

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 53192b4..3751e4e 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -100,8 +100,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), \