p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit 'bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
  Allow multiple asset directories in aapt
This commit is contained in:
Adam Lesinski 2014-02-05 00:56:13 +00:00 committed by Android Git Automerger
parent 19753f458b bebb2b54ce
commit 9cee77b370
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/package.mk
View File

@ -100,8 +100,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), \