Skip to content

Enable system mixing with vendor boot #3443

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

Merged
rmuthiah merged 2 commits into from
Oct 29, 2026
Merged

Enable system mixing with vendor boot #3443

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
3c2ce64
Allow DiskArtifact message to be used with other artifact fields
Oct 27, 2026
bc0c70d
Do not use a signed build if the image is being mixed.
Oct 27, 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
19 changes: 1 addition & 18 deletions base/cvd/cuttlefish/host/commands/cvd/cli/parser/cf_flags_validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,23 @@
namespace cuttlefish {
namespace {

using cvd::config::Boot;
using cvd::config::Disk;
using cvd::config::DiskArtifacts;
using cvd::config::EnvironmentSpecification;
using cvd::config::Instance;
using google::protobuf::util::JsonStringToMessage;

bool HasLegacyArtifacts(const Instance& instance) {
const Disk& disk = instance.disk();
const Boot& boot = instance.boot();
return disk.has_super_partition() || boot.has_kernel() || boot.has_build() ||
boot.has_bootloader() || boot.has_android_efi_loader();
}

Result<void> ValidateDiskArtifacts(
const EnvironmentSpecification& launch_config) {
bool has_legacy_artifacts = false;
bool has_disk_artifacts = false;
for (const Instance& instance : launch_config.instances()) {
if (HasLegacyArtifacts(instance)) {
has_legacy_artifacts = true;
}
if (instance.disk().has_disk_artifacts()) {
has_disk_artifacts = true;
const DiskArtifacts& disk_artifacts = instance.disk().disk_artifacts();
if (disk_artifacts.has_vendor_boot()) {
CF_EXPECT(!disk_artifacts.vendor_boot().empty(),
"disk_artifacts vendor_boot build must not be empty");
}
}
}
CF_EXPECT(!(has_legacy_artifacts && has_disk_artifacts),
"Cannot use disk_artifacts together with legacy disk/boot "
"artifact options");

return {};
}

Expand Down
91 changes: 0 additions & 91 deletions base/cvd/cuttlefish/host/commands/cvd/cli/parser/flags_parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,97 +449,6 @@ TEST(FlagsParserTest, ParseMediaTwoInstancesOnlySecondHasDevice) {
<< "media flag is missing or wrongly formatted";
}

TEST(DiskArtifactsValidationTest, ConflictWithLegacyOverrideFails) {
const std::vector<std::string> invalid_configs = {
R""""(
{
"instances": [
{
"disk": {
"super": {
"system": "@ab/git_main/cf_x86_64_auto"
},
"disk_artifacts": {}
}
}
]
}
)"""",
R""""(
{
"instances": [
{
"boot": {
"kernel": {
"build": "@ab/git_main/cf_x86_64_auto"
}
},
"disk": {
"disk_artifacts": {}
}
}
]
}
)"""",
R""""(
{
"instances": [
{
"boot": {
"build": "@ab/git_main/cf_x86_64_auto"
},
"disk": {
"disk_artifacts": {}
}
}
]
}
)"""",
R""""(
{
"instances": [
{
"boot": {
"bootloader": {
"build": "@ab/git_main/cf_x86_64_auto"
}
},
"disk": {
"disk_artifacts": {}
}
}
]
}
)"""",
R""""(
{
"instances": [
{
"boot": {
"android_efi_loader": {
"build": "@ab/git_main/cf_x86_64_auto"
}
},
"disk": {
"disk_artifacts": {}
}
}
]
}
)"""",
};

for (const std::string& test_string : invalid_configs) {
SCOPED_TRACE(test_string);
Json::Value json_configs;
std::string json_text(test_string);

EXPECT_TRUE(ParseJsonString(json_text, json_configs))
<< "Invalid Json string";
EXPECT_THAT(LaunchCvdParserTester(json_configs), IsError());
}
}

TEST(DiskArtifactsValidationTest, EmptyVendorBootBuildFails) {
const std::string test_string = R""""(
{
Expand Down
20 changes: 14 additions & 6 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,25 @@ Result<void> FetchDefaultTarget(FetchBuildContext& context,
if (!context.Artifact("misc_info.txt").Download().has_value()) {
VLOG(0) << "Failed to download misc_info.txt, continuing";
}
const bool download_target_files =
has_system_build || flags.download_target_files_zip;
const bool use_target_files =
download_target_files || flags.dynamic_super_image;
if (flags.download_img_zip) {
LOG(INFO) << "Downloading image zip for " << context;
const std::string img_zip_name =
CF_EXPECT(context.GetBuildZipName(BuildZipKind::kImages));
std::string img_zip_artifact_name = img_zip_name;
if (IsSignedBuild(context.Build())) {
img_zip_artifact_name = kSignedPrefix + img_zip_artifact_name;
LOG(INFO) << "Attempting to fetch SIGNED default image zip: "
<< img_zip_artifact_name;
if (!use_target_files) {
img_zip_artifact_name = kSignedPrefix + img_zip_artifact_name;
LOG(INFO) << "Attempting to fetch SIGNED default image zip: "
<< img_zip_artifact_name;
} else {
LOG(INFO) << "Signed build is available, but using the unsigned "
"build because other unsigned builds will be used "
"to mix a new super image.";
}
}
FetchArtifact img_zip = context.Artifact(img_zip_artifact_name);
CF_EXPECT(img_zip.Download());
Expand All @@ -261,9 +271,7 @@ Result<void> FetchDefaultTarget(FetchBuildContext& context,
CF_EXPECT(img_zip.DeleteLocalFile());
}
}
const bool download_target_files =
has_system_build || flags.download_target_files_zip;
if (download_target_files || flags.dynamic_super_image) {
if (use_target_files) {
const std::string target_files_name =
CF_EXPECT(context.GetBuildZipName(BuildZipKind::kTargetFiles));
FetchArtifact target_files = context.Artifact(target_files_name);
Expand Down
Loading