From 13f0b68a8fad5ea7a3efe6e2f5e9df0216db5323 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Wed, 8 May 2024 22:39:19 +0000 Subject: [PATCH] Reland "Fix retrofit OTA generation failures" This reverts commit 681597df18cf9105c59551808dea16b742893f30. retrofit OTA generation relies on files in OTA/* , include these files when copying target_files dir to tmp location. Test: th Bug: 337043530 Fixes: 337043530 Change-Id: Id9bb1cddcf992556923a17fd3f9b5e41eac7ca96 --- tools/releasetools/ota_utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py index 048a497585..81b53dce36 100644 --- a/tools/releasetools/ota_utils.py +++ b/tools/releasetools/ota_utils.py @@ -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