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

Merge "Reland "Fix retrofit OTA generation failures"" into main am: 67c90ed1e9

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

Change-Id: Ida7f1fdec8feee4d400411f31bc9aab7cb45642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-09 17:34:49 +00:00
committed by Automerger Merge Worker
parent 3164582b6b 67c90ed1e9
commit 197f41f23d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/ota_utils.py
View File

@@ -1111,9 +1111,10 @@ 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)
if os.path.exists(target_path):
continue
os.makedirs(os.path.dirname(target_path), exist_ok=True)
shutil.copy(path, target_path)
return output_dir