assemble_cvd: Support prebuilt android_esp.img in android_efi_loader - #3006
Open
zbw182 wants to merge 2 commits into
Open
assemble_cvd: Support prebuilt android_esp.img in android_efi_loader#3006zbw182 wants to merge 2 commits into
zbw182 wants to merge 2 commits into
Conversation
…flow When --android_efi_loader is not explicitly specified on the command line, check for a prebuilt android_esp.img partition in system_image_dir (including system/etc/android_esp.img) before falling back to android_efi_loader.efi. If android_esp.img is present, copy it directly to the instance ESP image path in BuildOSImage, bypassing host-side ESP generation via esp.cpp. If --android_efi_loader is explicitly passed (e.g. pointing to a standalone GBL .efi binary), preserve the existing dynamic generation behavior. Bug: 401619000 Test: assemble_cvd Flag: EXEMPT host tool change
Member
|
FYI, it looks like there are some build/test errors. It's possible to reproduce these locally by running |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When --android_efi_loader is not explicitly specified on the command line, check for a prebuilt android_esp.img partition in system_image_dir (including system/etc/android_esp.img) before falling back to android_efi_loader.efi.
If android_esp.img is present, copy it directly to the instance ESP image path in BuildOSImage, bypassing host-side ESP generation via esp.cpp. If --android_efi_loader is explicitly passed (e.g. pointing to a standalone GBL .efi binary), preserve the existing dynamic generation behavior.