Skip to content

Commit 1f1f356

Browse files
committed
Rename --extract_super_image_fragments to --dynamic_super_image
This better describes the intended behavioral difference. The flag will enable a breaking change that assumes to-be-implemented behavior in `assemble_cvd` that will create the super image on-demand. Test: bazel run //cuttlefish/package:cvd -- fetch --dynamic_super_image=true
1 parent d1074af commit 1f1f356

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

base/cvd/cuttlefish/host/commands/cvd/fetch/download_flags.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ DownloadFlags DownloadFlags::Create(const VectorFlags& flags, const int index) {
2727
.download_target_files_zip =
2828
GetOptional(flags.download_target_files_zip, index)
2929
.value_or(kDefaultDownloadTargetFilesZip),
30-
.extract_super_image_fragments =
31-
GetOptional(flags.extract_super_image_fragments, index)
32-
.value_or(kDefaultExtractSuperImageFragments),
30+
.dynamic_super_image = GetOptional(flags.dynamic_super_image, index)
31+
.value_or(kDefaultDynamicSuperImageFragments),
3332
};
3433
}
3534

base/cvd/cuttlefish/host/commands/cvd/fetch/download_flags.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct DownloadFlags {
2424

2525
bool download_img_zip;
2626
bool download_target_files_zip;
27-
bool extract_super_image_fragments;
27+
bool dynamic_super_image;
2828
};
2929

3030
} // namespace cuttlefish

base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Result<void> FetchDefaultTarget(FetchBuildContext& context,
219219
fmt::format("default/{}", target_files_name);
220220
CF_EXPECT(target_files.DownloadTo(download_location));
221221
}
222-
if (flags.extract_super_image_fragments) {
222+
if (flags.dynamic_super_image) {
223223
ReadableZip* target_files_zip = CF_EXPECT(target_files.AsZip());
224224
ReadableZipSource ab_partitions_source =
225225
CF_EXPECT(target_files_zip->GetFile("META/ab_partitions.txt"));

base/cvd/cuttlefish/host/commands/cvd/fetch/vector_flags.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,9 @@ std::vector<Flag> VectorFlags::Flags() {
6969
kDefaultDownloadTargetFilesZip)
7070
.Help("Whether to fetch the -target_files-*.zip file."));
7171
flags.emplace_back(
72-
GflagsCompatFlag("extract_super_image_fragments",
73-
this->extract_super_image_fragments,
74-
kDefaultExtractSuperImageFragments)
75-
.Help("Whether to fetch the -target_files-*.zip file."));
72+
GflagsCompatFlag("dynamic_super_image", this->dynamic_super_image,
73+
kDefaultDynamicSuperImageFragments)
74+
.Help("Fetch the super image members as independent files."));
7675

7776
return flags;
7877
}

base/cvd/cuttlefish/host/commands/cvd/fetch/vector_flags.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace cuttlefish {
2828
inline constexpr bool kDefaultDownloadImgZip = true;
2929
inline constexpr bool kDefaultDownloadTargetFilesZip = false;
3030
// TODO: schuffelen - Enable this by default.
31-
inline constexpr bool kDefaultExtractSuperImageFragments = false;
31+
inline constexpr bool kDefaultDynamicSuperImageFragments = false;
3232

3333
struct VectorFlags {
3434
std::vector<Flag> Flags();
@@ -46,7 +46,7 @@ struct VectorFlags {
4646
std::vector<bool> download_img_zip;
4747
std::vector<bool> download_target_files_zip;
4848
std::vector<std::string> boot_artifact;
49-
std::vector<bool> extract_super_image_fragments;
49+
std::vector<bool> dynamic_super_image;
5050
};
5151

5252
} // namespace cuttlefish

0 commit comments

Comments
 (0)