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

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

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

Change-Id: I44bf1da6108f9a0f4974b73ab252fd1d2e2b23b8
This commit is contained in:
Treehugger Robot
2021-09-25 02:44:50 +00:00
committed by Automerger Merge Worker
parent 6d3e5ac6e7 128bfc440e
commit 73c444b40e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/product_config.rbc
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'.