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

Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d42

Browse Source 
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:
Treehugger Robot
2024-05-08 17:59:09 +00:00
committed by Automerger Merge Worker
parent 25974b6f62 9a78be4d42
commit 0ea0bb5249
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/ota_utils.py
View File

@@ -1111,9 +1111,8 @@ 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
if filename.endswith(".prop") or filename == "prop.default" or "/etc/vintf/" in relative_path: target_path = os.path.join(
target_path = os.path.join( output_dir, relative_path)
output_dir, relative_path) os.makedirs(os.path.dirname(target_path), exist_ok=True)
os.makedirs(os.path.dirname(target_path), exist_ok=True) shutil.copy(path, target_path)
shutil.copy(path, target_path)
return output_dir return output_dir