diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2024-05-08 20:10:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-08 20:10:22 +0000 |
| commit | 681597df18cf9105c59551808dea16b742893f30 (patch) | |
| tree | a7ac5da375ac3c0bc931e0569b3ba4f1a9f048f7 | |
| parent | 7af14aa7dad44d113aebc92f30fc061b6173f056 (diff) | |
| download | build-681597df18cf9105c59551808dea16b742893f30.tar.gz | |
Revert "Fix retrofit OTA generation failures"
This reverts commit 7af14aa7dad44d113aebc92f30fc061b6173f056.
Reason for revert: b/339483257
Change-Id: I86cf6c0baed8697ace888135b3d66b4785d22aa5
| -rw-r--r-- | tools/releasetools/ota_utils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py index 27364d0bd3..048a497585 100644 --- a/tools/releasetools/ota_utils.py +++ b/tools/releasetools/ota_utils.py @@ -1111,8 +1111,9 @@ def CopyTargetFilesDir(input_dir): relative_path = path.removeprefix(input_dir).removeprefix("/") if not Fnmatch(relative_path, UNZIP_PATTERN): continue - target_path = os.path.join( - output_dir, relative_path) - os.makedirs(os.path.dirname(target_path), exist_ok=True) - shutil.copy(path, target_path) + 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) return output_dir |