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

Merge "Follow symlinks when using find for assets"

Browse Source 
am: 4c4c06016b

* commit '4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
  Follow symlinks when using find for assets

Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
This commit is contained in:
Shinichiro Hamaji
2016-05-13 05:24:35 +00:00
committed by android-build-merger
parent bcbba61a25 4c4c06016b
commit 505f1eaaa9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -402,7 +402,7 @@ endef
define find-subdir-assets define find-subdir-assets
$(sort $(if $(1),$(patsubst ./%,%, \ $(sort $(if $(1),$(patsubst ./%,%, \
$(shell if [ -d $(1) ] ; then cd $(1) ; find ./ -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) \ $(warning Empty argument supplied to find-subdir-assets) \
)) ))
endef endef