Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3eb8979 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return find_and_copy result in sorted order." am: 128bfc44 am: 73c444b4

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

Change-Id: Ic40097a497db49cb3566b67bb69b93dc52033fca
parents 441fd282 73c444b4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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'.