StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt
This commit is contained in:
Adam Lesinski
2014-02-05 00:49:37 +00:00
committed by Android Git Automerger
parent bbfebfad0d 7b734fd8d1
commit bebb2b54ce
1 changed files with 8 additions and 2 deletions
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) LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
all_assets := $(call find-subdir-assets,$(LOCAL_ASSET_DIR)) all_assets := $(strip \
all_assets := $(addprefix $(LOCAL_ASSET_DIR)/,$(patsubst assets/%,%,$(all_assets))) $(foreach dir, $(LOCAL_ASSET_DIR), \
$(addprefix $(dir)/, \
$(patsubst assets/%,%, \
$(call find-subdir-assets, $(dir)) \
) \
) \
))
all_resources := $(strip \ all_resources := $(strip \
$(foreach dir, $(LOCAL_RESOURCE_DIR), \ $(foreach dir, $(LOCAL_RESOURCE_DIR), \