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

Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3 am: 04158fac7c 

am: c2e68615e7

Change-Id: I883c75d41f89d19317fce27135d87de7eef0b6ba
This commit is contained in:
Colin Cross 2016-12-02 22:48:02 +00:00 committed by android-build-merger
parent f515dbff65 c2e68615e7
commit d9aae72d14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@ -417,7 +417,7 @@ endef
define find-subdir-assets
$(sort $(if $(1),$(patsubst ./%,%, \
$(shell if [ -d $(1) ] ; then cd $(1) ; find -L ./ -not -name '.*' -and -type f ; fi)), \
$(warning Empty argument supplied to find-subdir-assets) \
$(warning Empty argument supplied to find-subdir-assets in $(LOCAL_PATH)) \
))
endef

4
core/package_internal.mk
View File

@ -136,9 +136,9 @@ my_overlay_resources := $(strip \
$(addprefix $(d)/, \
$(call find-subdir-assets,$(d)))))
my_res_resources := $(strip \
my_res_resources := $(if $(my_res_dir),$(strip \
$(addprefix $(my_res_dir)/, \
$(call find-subdir-assets,$(my_res_dir))))
$(call find-subdir-assets,$(my_res_dir)))))
all_resources := $(strip $(my_res_resources) $(my_overlay_resources))