| commit | 4702d2fe7f36854a06a8ac29234a5a7efb78a1f1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 05 01:08:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 05 01:08:10 2024 +0000 |
| tree | 9481cf8fb086476c45da8254c71fb551b870fb07 | |
| parent | 868f7db3aa7aaf39732a53dd29b6712c8e6af6ac [diff] | |
| parent | da240f8f9af9de60cf9f9f7a77329760c6ae57ce [diff] |
Merge "Process source_file through GetTargetFilesZipForCustomImagesUpdates" into main am: 1a309e58f2 am: da240f8f9a Original change: https://android-review.googlesource.com/c/platform/build/+/3391920 Change-Id: I233b2ee417d15bcbf0ad8a1ec6b7631591cbe7c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 6446e1f..1a6ee29 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py
@@ -1039,6 +1039,9 @@ # Prepare custom images. if OPTIONS.custom_images: + if source_file is not None: + source_file = GetTargetFilesZipForCustomImagesUpdates( + source_file, OPTIONS.custom_images) target_file = GetTargetFilesZipForCustomImagesUpdates( target_file, OPTIONS.custom_images)