am 7c4b2ced: am 05bb4fed: am edc3e6cd: Merge "Sort more instances of wildcard and find"

* commit '7c4b2cedd690fad83353650f98bc25bf657a7075':
  Sort more instances of wildcard and find
This commit is contained in:
Dan Willemsen
2015-10-01 00:05:15 +00:00
committed by Android Git Automerger
7 changed files with 15 additions and 15 deletions

View File

@@ -55,7 +55,7 @@ ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),)
$(foreach dir,$(LOCAL_JAVA_RESOURCE_DIRS), \
$(subst $(space),:,$(strip \
$(LOCAL_PATH)/$(dir): \
$(patsubst ./%,%,$(shell cd $(LOCAL_PATH)/$(dir) && \
$(patsubst ./%,%,$(sort $(shell cd $(LOCAL_PATH)/$(dir) && \
find . \
-type d -a -name ".svn" -prune -o \
-type f \
@@ -66,7 +66,7 @@ ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),)
-a \! -name ".DS_Store" \
-a \! -name "*~" \
-print \
)) \
))) \
)) \
)
java_resource_file_groups := $(filter-out %:,$(java_resource_file_groups))