Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ca3367 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge changes Ib72f6a1c,I46d798fa am: 3c962eee 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2609188



Change-Id: I6046d9681b01090e93e60a25054e0f489e542629
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8e0dc01 3c962eee

fastboot/fastboot.cpp

+17 −7
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int make_temporary_fd(const char* what) { 


#endif



static unique_fd unzip_to_file(ZipArchiveHandle zip, const char* entry_name) {

static unique_fd UnzipToFile(ZipArchiveHandle zip, const char* entry_name) {

    unique_fd fd(make_temporary_fd(entry_name));



    ZipEntry64 zip_entry;
@@ -1646,14 +1646,22 @@ std::unique_ptr<Task> ParseFastbootInfoLine(const FlashingPlan* fp, 
    return task;

}



void AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>* tasks) {

bool AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>* tasks) {

    // expands "resize-partitions" into individual commands : resize {os_partition_1}, resize

    // {os_partition_2}, etc.

    std::vector<std::unique_ptr<Task>> resize_tasks;

    std::optional<size_t> loc;

    std::vector<char> contents;

    if (!fp->source->ReadFile("super_empty.img", &contents)) {

        return false;

    }

    auto metadata = android::fs_mgr::ReadFromImageBlob(contents.data(), contents.size());

    if (!metadata) {

        return false;

    }

    for (size_t i = 0; i < tasks->size(); i++) {

        if (auto flash_task = tasks->at(i)->AsFlashTask()) {

            if (should_flash_in_userspace(flash_task->GetPartitionAndSlot())) {

            if (should_flash_in_userspace(*metadata.get(), flash_task->GetPartitionAndSlot())) {

                if (!loc) {

                    loc = i;

                }
@@ -1665,11 +1673,11 @@ void AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>* 
    // if no logical partitions (although should never happen since system will always need to be

    // flashed)

    if (!loc) {

        return;

        return false;

    }

    tasks->insert(tasks->begin() + loc.value(), std::make_move_iterator(resize_tasks.begin()),

                  std::make_move_iterator(resize_tasks.end()));

    return;

    return true;

}



static bool IsIgnore(const std::vector<std::string>& command) {
@@ -1750,7 +1758,9 @@ std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp, 
        }

        tasks.insert(it, std::move(flash_super_task));

    } else {

        AddResizeTasks(fp, &tasks);

        if (!AddResizeTasks(fp, &tasks)) {

            LOG(WARNING) << "Failed to add resize tasks";

        };

    }

    return tasks;

}
@@ -1928,7 +1938,7 @@ bool ZipImageSource::ReadFile(const std::string& name, std::vector<char>* out) c 
}



unique_fd ZipImageSource::OpenFile(const std::string& name) const {

    return unzip_to_file(zip_, name.c_str());

    return UnzipToFile(zip_, name.c_str());

}



static void do_update(const char* filename, FlashingPlan* fp) {

fastboot/fastboot.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ std::unique_ptr<WipeTask> ParseWipeCommand(const FlashingPlan* fp, 
                                           const std::vector<std::string>& parts);

std::unique_ptr<Task> ParseFastbootInfoLine(const FlashingPlan* fp,

                                            const std::vector<std::string>& command);

void AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>& tasks);

bool AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>& tasks);

std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp,

                                                     const std::vector<std::string>& file);