Merge "Return find_and_copy result in sorted order." am: 128bfc440e am: 73c444b40e

Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: Ic40097a497db49cb3566b67bb69b93dc52033fca
This commit is contained in:
Treehugger Robot 2021-09-25 02:54:43 +00:00 committed by Automerger Merge Worker
commit e3eb897949

View file

@ -401,8 +401,8 @@ def _file_wildcard_exists(file_pattern):
def _find_and_copy(pattern, from_dir, to_dir):
"""Return a copy list for the files matching the pattern."""
return ["%s/%s:%s/%s" % (
from_dir, f, to_dir, f) for f in rblf_find_files(from_dir, pattern, only_files=1)]
return sorted(["%s/%s:%s/%s" % (
from_dir, f, to_dir, f) for f in rblf_find_files(from_dir, pattern, only_files=1)])
def _filter_out(pattern, text):
"""Return all the words from `text' that do not match any word in `pattern'.