tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Adding flag to flash only static partitions" into main

Browse source
This commit is contained in:
Daniel Zheng 2023-08-09 18:09:00 +00:00 committed by Gerrit Code Review
commit 720007ba43
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fastboot/fastboot.cpp
View file

@ -1801,6 +1801,7 @@ void FlashAllTool::Flash() {
CancelSnapshotIfNeeded();
tasks_ = CollectTasks();
for (auto& task : tasks_) {
task->Run();
}
@ -1815,7 +1816,18 @@ std::vector<std::unique_ptr<Task>> FlashAllTool::CollectTasks() {
} else {
tasks = CollectTasksFromImageList();
}
if (fp_->exclude_dynamic_partitions) {
auto is_non_static_flash_task = [](const auto& task) -> bool {
if (auto flash_task = task->AsFlashTask()) {
if (!should_flash_in_userspace(flash_task->GetPartitionAndSlot())) {
return false;
}
}
return true;
};
tasks.erase(std::remove_if(tasks.begin(), tasks.end(), is_non_static_flash_task),
tasks.end());
}
return tasks;
}
@ -2219,6 +2231,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
{"disable-verification", no_argument, 0, 0},
{"disable-verity", no_argument, 0, 0},
{"disable-super-optimization", no_argument, 0, 0},
{"exclude-dynamic-partitions", no_argument, 0, 0},
{"disable-fastboot-info", no_argument, 0, 0},
{"force", no_argument, 0, 0},
{"fs-options", required_argument, 0, 0},
@ -2260,6 +2273,9 @@ int FastBootTool::Main(int argc, char* argv[]) {
g_disable_verity = true;
} else if (name == "disable-super-optimization") {
fp->should_optimize_flash_super = false;
} else if (name == "exclude-dynamic-partitions") {
fp->exclude_dynamic_partitions = true;
fp->should_optimize_flash_super = false;
} else if (name == "disable-fastboot-info") {
fp->should_use_fastboot_info = false;
} else if (name == "force") {

1
fastboot/fastboot.h
View file

@ -99,6 +99,7 @@ struct FlashingPlan {
bool force_flash = false;
bool should_optimize_flash_super = true;
bool should_use_fastboot_info = true;
bool exclude_dynamic_partitions = false;
uint64_t sparse_limit = 0;
std::string slot_override;