Skip to content

assemble_cvd: Support prebuilt android_esp.img in android_efi_loader #3006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zbw182 wants to merge 2 commits into
base: main
Choose a base branch
from
+35 −6
Open

assemble_cvd: Support prebuilt android_esp.img in android_efi_loader #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0c39db
assemble_cvd: Support prebuilt android_esp.img in android_efi_loader …
zbw182 Aug 11, 2026
a108f90
Merge branch 'main' into feature/gbl-esp-boot
zbw182 Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/flags/android_efi_loader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,37 @@ DEFINE_string(android_efi_loader, CF_DEFAULTS_ANDROID_EFI_LOADER,
namespace cuttlefish {
namespace {

static constexpr std::string_view kName = "/android_efi_loader.efi";
static constexpr std::string_view kEspImageName = "/android_esp.img";
static constexpr std::string_view kSystemEtcEspImageName =
"/system/etc/android_esp.img";
static constexpr std::string_view kEfiLoaderName = "/android_efi_loader.efi";

std::vector<std::string> DefaultPaths(
const SystemImageDirFlag& system_image_dirs) {
std::vector<std::string> paths;
for (std::string_view system_image_dir : system_image_dirs.AsVector()) {
// EFI loader isn't present in the output folder by default and can be only
// fetched by --android_efi_loader_build in fetch_cvd, so pick it only in
// case it's present.
std::string path = absl::StrCat(system_image_dir, kName);
paths.emplace_back(FileExists(path) ? std::move(path) : "");
// 1. Check for prebuilt ESP partition image (android_esp.img)
std::string esp_path = absl::StrCat(system_image_dir, kEspImageName);
if (FileExists(esp_path)) {
paths.emplace_back(std::move(esp_path));
continue;
}
std::string system_etc_esp_path =
absl::StrCat(system_image_dir, kSystemEtcEspImageName);
if (FileExists(system_etc_esp_path)) {
paths.emplace_back(std::move(system_etc_esp_path));
continue;
}

// 2. Fallback to standalone EFI loader binary (android_efi_loader.efi)
std::string efi_loader_path =
absl::StrCat(system_image_dir, kEfiLoaderName);
if (FileExists(efi_loader_path)) {
paths.emplace_back(std::move(efi_loader_path));
continue;
}

paths.emplace_back("");
}
return paths;
}
Expand Down
9 changes: 9 additions & 0 deletions base/cvd/cuttlefish/host/libs/config/data_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <utility>

#include "absl/log/log.h"
#include "absl/strings/match.h"

#include "cuttlefish/common/libs/fs/shared_buf.h"
#include "cuttlefish/common/libs/fs/shared_fd.h"
Expand Down Expand Up @@ -317,6 +318,14 @@ static bool BuildAPImage(const CuttlefishConfig& config,
static bool BuildOSImage(const CuttlefishConfig::InstanceSpecific& instance) {
switch (instance.boot_flow()) {
case BootFlow::AndroidEfiLoader: {
if (absl::EndsWith(instance.android_efi_loader(), ".img")) {
if (!Copy(instance.android_efi_loader(), instance.esp_image_path())) {
LOG(ERROR) << "Failed to copy " << instance.android_efi_loader()
<< " to " << instance.esp_image_path();
return false;
}
return true;
}
auto android_efi_loader =
AndroidEfiLoaderEspBuilder(instance.esp_image_path());
android_efi_loader.EfiLoaderPath(instance.android_efi_loader())
Expand Down
Loading