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

Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83

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

Change-Id: I4412735014ebb52f7bee6a10c3f29a9a153d1ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang
2024-05-08 21:00:30 +00:00
committed by Automerger Merge Worker
parent 3807c32bff e41c75cb83
commit 094641230e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/ota_utils.py
View File

@@ -1111,8 +1111,9 @@ def CopyTargetFilesDir(input_dir):
relative_path = path.removeprefix(input_dir).removeprefix("/") relative_path = path.removeprefix(input_dir).removeprefix("/")
if not Fnmatch(relative_path, UNZIP_PATTERN): if not Fnmatch(relative_path, UNZIP_PATTERN):
continue continue
target_path = os.path.join( if filename.endswith(".prop") or filename == "prop.default" or "/etc/vintf/" in relative_path:
output_dir, relative_path) target_path = os.path.join(
os.makedirs(os.path.dirname(target_path), exist_ok=True) output_dir, relative_path)
shutil.copy(path, target_path) os.makedirs(os.path.dirname(target_path), exist_ok=True)
shutil.copy(path, target_path)
return output_dir return output_dir