commit bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0
author Adam Lesinski <adamlesinski@google.com> Wed Feb 05 00:49:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 05 00:49:37 2014 +0000
tree e7ecbe49970cc33140ae0c0353301f1b8f34a670
parent bbfebfad0d8ad002995bb1005b61a35b42a8ce35
parent 7b734fd8d163f7a71254b909fbbcd358129924b7

am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev

* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 559a3d9..ba07104 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), \