| commit | da240f8f9af9de60cf9f9f7a77329760c6ae57ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 05 01:07:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 05 01:07:42 2024 +0000 |
| tree | baf65e585d1cb11b4a771b5333bb0183d47f5d05 | |
| parent | 24a3b89fce0c74ded504ff79f68fb6fbaf30ef3b [diff] | |
| parent | 1a309e58f267955e7f726bd276c19d4eff2093ab [diff] |
Merge "Process source_file through GetTargetFilesZipForCustomImagesUpdates" into main am: 1a309e58f2 Original change: https://android-review.googlesource.com/c/platform/build/+/3391920 Change-Id: I3e4b275eb758ec4067d330ea43ffda6324aefba4 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)