Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d42
Original change: https://android-review.googlesource.com/c/platform/build/+/3079783 Change-Id: I5696ce46f677bad2a9b1a5c182a7e84d2f814d37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
0ea0bb5249
1 changed files with 4 additions and 5 deletions
|
@ -1111,9 +1111,8 @@ def CopyTargetFilesDir(input_dir):
|
|||
relative_path = path.removeprefix(input_dir).removeprefix("/")
|
||||
if not Fnmatch(relative_path, UNZIP_PATTERN):
|
||||
continue
|
||||
if filename.endswith(".prop") or filename == "prop.default" or "/etc/vintf/" in relative_path:
|
||||
target_path = os.path.join(
|
||||
output_dir, relative_path)
|
||||
os.makedirs(os.path.dirname(target_path), exist_ok=True)
|
||||
shutil.copy(path, target_path)
|
||||
target_path = os.path.join(
|
||||
output_dir, relative_path)
|
||||
os.makedirs(os.path.dirname(target_path), exist_ok=True)
|
||||
shutil.copy(path, target_path)
|
||||
return output_dir
|
||||
|
|
Loading…
Reference in a new issue