diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-08 17:35:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-08 17:35:43 +0000 |
| commit | 9a78be4d42ef53344570c8a5c9ba796a794dbb0f (patch) | |
| tree | 8acb1e94c7fb97e385ff24d9f475277a8d8f6b7a | |
| parent | 32b652fd68e9d17be61b3a6a0c5ceff213b29b36 (diff) | |
| parent | 7af14aa7dad44d113aebc92f30fc061b6173f056 (diff) | |
| download | build-9a78be4d42ef53344570c8a5c9ba796a794dbb0f.tar.gz | |
Merge "Fix retrofit OTA generation failures" into main
| -rw-r--r-- | tools/releasetools/ota_utils.py | 9 |
1 files 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 |