Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83

Original change: https://android-review.googlesource.com/c/platform/build/+/3079786

Change-Id: I4412735014ebb52f7bee6a10c3f29a9a153d1ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang
2024-05-08 21:00:30 +00:00
committed by Automerger Merge Worker

View File

@@ -1111,6 +1111,7 @@ 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)