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

Merge "Remove duplicate slashes from find_and_copy results" am: 057667a90f am: 4ea401ac58

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

Change-Id: I9feb6ebcf98b006d7356bbacc3f353f215c51975
This commit is contained in:
Treehugger Robot
2022-03-08 21:13:26 +00:00
committed by Automerger Merge Worker
parent 49d1af3469 4ea401ac58
commit ff1eb87176
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

@@ -479,8 +479,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 sorted(["%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))
.replace("//", "/") for f in rblf_find_files(from_dir, pattern, only_files=1)])
def _findstring(needle, haystack):
"""Equivalent to GNU make's $(findstring)."""