ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Change source to be a unique_ptr." into main

Browse source
This commit is contained in:
Christopher Ferris 2023-10-05 00:13:19 +00:00 • committed by Gerrit Code Review
commit e9f4feaf7e
4 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fastboot/fastboot.cpp
View file

@ -1525,7 +1525,7 @@ void do_flash(const char* pname, const char* fname, const bool apply_vbmeta,
fb->ResizePartition(pname, std::to_string(buf.image_size)); fb->ResizePartition(pname, std::to_string(buf.image_size));
} }
std::string flash_pname = repack_ramdisk(pname, &buf, fp->fb); std::string flash_pname = repack_ramdisk(pname, &buf, fp->fb);
flash_buf(fp->source, flash_pname, &buf, apply_vbmeta); flash_buf(fp->source.get(), flash_pname, &buf, apply_vbmeta);
} }
// Sets slot_override as the active slot. If slot_override is blank, // Sets slot_override as the active slot. If slot_override is blank,
@ -1679,7 +1679,7 @@ bool AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>*
} }
for (size_t i = 0; i < tasks->size(); i++) { for (size_t i = 0; i < tasks->size(); i++) {
if (auto flash_task = tasks->at(i)->AsFlashTask()) { if (auto flash_task = tasks->at(i)->AsFlashTask()) {
if (FlashTask::IsDynamicParitition(fp->source, flash_task)) { if (FlashTask::IsDynamicParitition(fp->source.get(), flash_task)) {
if (!loc) { if (!loc) {
loc = i; loc = i;
} }
@ -1810,7 +1810,8 @@ std::vector<std::unique_ptr<Task>> FlashAllTool::CollectTasks() {
if (fp_->exclude_dynamic_partitions) { if (fp_->exclude_dynamic_partitions) {
auto is_non_static_flash_task = [&](const auto& task) -> bool { auto is_non_static_flash_task = [&](const auto& task) -> bool {
if (auto flash_task = task->AsFlashTask()) { if (auto flash_task = task->AsFlashTask()) {
if (!should_flash_in_userspace(fp_->source, flash_task->GetPartitionAndSlot())) { if (!should_flash_in_userspace(fp_->source.get(),
flash_task->GetPartitionAndSlot())) {
return false; return false;
} }
} }
@ -1884,9 +1885,10 @@ std::vector<std::unique_ptr<Task>> FlashAllTool::CollectTasksFromImageList() {
// On these devices, secondary slots must be flashed as physical // On these devices, secondary slots must be flashed as physical
// partitions (otherwise they would not mount on first boot). To enforce // partitions (otherwise they would not mount on first boot). To enforce
// this, we delete any logical partitions for the "other" slot. // this, we delete any logical partitions for the "other" slot.
if (is_retrofit_device(fp_->source)) { if (is_retrofit_device(fp_->source.get())) {
std::string partition_name = image->part_name + "_" + slot; std::string partition_name = image->part_name + "_" + slot;
if (image->IsSecondary() && should_flash_in_userspace(fp_->source, partition_name)) { if (image->IsSecondary() &&
should_flash_in_userspace(fp_->source.get(), partition_name)) {
tasks.emplace_back(std::make_unique<DeleteTask>(fp_, partition_name)); tasks.emplace_back(std::make_unique<DeleteTask>(fp_, partition_name));
} }
} }
@ -1949,8 +1951,7 @@ static void do_update(const char* filename, FlashingPlan* fp) {
if (error != 0) { if (error != 0) {
die("failed to open zip file '%s': %s", filename, ErrorCodeString(error)); die("failed to open zip file '%s': %s", filename, ErrorCodeString(error));
} }
ZipImageSource zp = ZipImageSource(zip); fp->source.reset(new ZipImageSource(zip));
fp->source = &zp;
FlashAllTool tool(fp); FlashAllTool tool(fp);
tool.Flash(); tool.Flash();
@ -1971,8 +1972,7 @@ unique_fd LocalImageSource::OpenFile(const std::string& name) const {
} }
static void do_flashall(FlashingPlan* fp) { static void do_flashall(FlashingPlan* fp) {
LocalImageSource s = LocalImageSource(); fp->source.reset(new LocalImageSource());
fp->source = &s;
FlashAllTool tool(fp); FlashAllTool tool(fp);
tool.Flash(); tool.Flash();
} }
@ -2089,7 +2089,7 @@ void fb_perform_format(const std::string& partition, int skip_if_not_supported,
die("Cannot read image: %s", strerror(errno)); die("Cannot read image: %s", strerror(errno));
} }
flash_buf(fp->source, partition, &buf, is_vbmeta_partition(partition)); flash_buf(fp->source.get(), partition, &buf, is_vbmeta_partition(partition));
return; return;
failed: failed:

3
fastboot/fastboot.h
View file

@ -28,6 +28,7 @@
#pragma once #pragma once
#include <functional> #include <functional>
#include <memory>
#include <string> #include <string>
#include "fastboot_driver_interface.h" #include "fastboot_driver_interface.h"
#include "filesystem.h" #include "filesystem.h"
@ -89,7 +90,7 @@ struct FlashingPlan {
// If the image uses the default slot, or the user specified "all", then // If the image uses the default slot, or the user specified "all", then
// the paired string will be empty. If the image requests a specific slot // the paired string will be empty. If the image requests a specific slot
// (for example, system_other) it is specified instead. // (for example, system_other) it is specified instead.
ImageSource* source; std::unique_ptr<ImageSource> source;
bool wants_wipe = false; bool wants_wipe = false;
bool skip_reboot = false; bool skip_reboot = false;
bool wants_set_active = false; bool wants_set_active = false;

4
fastboot/task.cpp
View file

@ -41,7 +41,7 @@ bool FlashTask::IsDynamicParitition(const ImageSource* source, const FlashTask*
void FlashTask::Run() { void FlashTask::Run() {
auto flash = [&](const std::string& partition) { auto flash = [&](const std::string& partition) {
if (should_flash_in_userspace(fp_->source, partition) && !is_userspace_fastboot() && if (should_flash_in_userspace(fp_->source.get(), partition) && !is_userspace_fastboot() &&
!fp_->force_flash) { !fp_->force_flash) {
die("The partition you are trying to flash is dynamic, and " die("The partition you are trying to flash is dynamic, and "
"should be flashed via fastbootd. Please run:\n" "should be flashed via fastbootd. Please run:\n"
@ -174,7 +174,7 @@ std::unique_ptr<OptimizedFlashSuperTask> OptimizedFlashSuperTask::Initialize(
LOG(VERBOSE) << "Cannot optimize flashing super for all slots"; LOG(VERBOSE) << "Cannot optimize flashing super for all slots";
return nullptr; return nullptr;
} }
if (!CanOptimize(fp->source, tasks)) { if (!CanOptimize(fp->source.get(), tasks)) {
return nullptr; return nullptr;
} }

18
fastboot/task_test.cpp
View file

@ -192,8 +192,7 @@ TEST_F(ParseTest, CorrectTaskLists) {
GTEST_SKIP(); GTEST_SKIP();
} }
LocalImageSource s; fp->source.reset(new LocalImageSource);
fp->source = &s;
fp->sparse_limit = std::numeric_limits<int64_t>::max(); fp->sparse_limit = std::numeric_limits<int64_t>::max();
fastboot::MockFastbootDriver fb; fastboot::MockFastbootDriver fb;
@ -239,8 +238,7 @@ TEST_F(ParseTest, IsDynamicParitiontest) {
GTEST_SKIP(); GTEST_SKIP();
} }
LocalImageSource s; fp->source.reset(new LocalImageSource);
fp->source = &s;
fastboot::MockFastbootDriver fb; fastboot::MockFastbootDriver fb;
fp->fb = &fb; fp->fb = &fb;
@ -260,7 +258,7 @@ TEST_F(ParseTest, IsDynamicParitiontest) {
ParseFastbootInfoLine(fp.get(), android::base::Tokenize(test.first, " ")); ParseFastbootInfoLine(fp.get(), android::base::Tokenize(test.first, " "));
auto flash_task = task->AsFlashTask(); auto flash_task = task->AsFlashTask();
ASSERT_FALSE(flash_task == nullptr); ASSERT_FALSE(flash_task == nullptr);
ASSERT_EQ(FlashTask::IsDynamicParitition(fp->source, flash_task), test.second); ASSERT_EQ(FlashTask::IsDynamicParitition(fp->source.get(), flash_task), test.second);
} }
} }
@ -269,8 +267,7 @@ TEST_F(ParseTest, CanOptimizeTest) {
GTEST_SKIP(); GTEST_SKIP();
} }
LocalImageSource s; fp->source.reset(new LocalImageSource);
fp->source = &s;
fp->sparse_limit = std::numeric_limits<int64_t>::max(); fp->sparse_limit = std::numeric_limits<int64_t>::max();
fastboot::MockFastbootDriver fb; fastboot::MockFastbootDriver fb;
@ -301,7 +298,7 @@ TEST_F(ParseTest, CanOptimizeTest) {
for (auto& test : patternmatchtest) { for (auto& test : patternmatchtest) {
std::vector<std::unique_ptr<Task>> tasks = ParseFastbootInfo(fp.get(), test.first); std::vector<std::unique_ptr<Task>> tasks = ParseFastbootInfo(fp.get(), test.first);
tasks.erase(std::remove_if(tasks.begin(), tasks.end(), remove_if_callback), tasks.end()); tasks.erase(std::remove_if(tasks.begin(), tasks.end(), remove_if_callback), tasks.end());
ASSERT_EQ(OptimizedFlashSuperTask::CanOptimize(fp->source, tasks), test.second); ASSERT_EQ(OptimizedFlashSuperTask::CanOptimize(fp->source.get(), tasks), test.second);
} }
} }
@ -312,8 +309,7 @@ TEST_F(ParseTest, OptimizedFlashSuperPatternMatchTest) {
GTEST_SKIP(); GTEST_SKIP();
} }
LocalImageSource s; fp->source.reset(new LocalImageSource);
fp->source = &s;
fp->sparse_limit = std::numeric_limits<int64_t>::max(); fp->sparse_limit = std::numeric_limits<int64_t>::max();
fastboot::MockFastbootDriver fb; fastboot::MockFastbootDriver fb;
@ -362,7 +358,7 @@ TEST_F(ParseTest, OptimizedFlashSuperPatternMatchTest) {
contains_optimized_task = true; contains_optimized_task = true;
} }
if (auto flash_task = task->AsFlashTask()) { if (auto flash_task = task->AsFlashTask()) {
if (FlashTask::IsDynamicParitition(fp->source, flash_task)) { if (FlashTask::IsDynamicParitition(fp->source.get(), flash_task)) {
return false; return false;
} }
} }