openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of 505f1ea to nyc-dev-plus-aosp 

Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
This commit is contained in:
Shinichiro Hamaji 2016-05-13 14:33:09 +09:00
parent 2697421213 505f1eaaa9
commit 4ed2ff913b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

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