From 7af14aa7dad44d113aebc92f30fc061b6173f056 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Wed, 8 May 2024 09:28:40 -0700 Subject: [PATCH] Fix retrofit OTA generation failures 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: I8fd7729bc1b2d2797f7e76f594b06fd9675fa104 --- tools/releasetools/ota_utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py index 048a497585..27364d0bd3 100644 --- a/tools/releasetools/ota_utils.py +++ b/tools/releasetools/ota_utils.py @@ -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