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

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

Merge "is_retrofit_device to work in bootloader" into main am: d774be9b am:... 

Merge "is_retrofit_device to work in bootloader" into main am: d774be9b am: d545b316 am: 599b6b0f am: 830e2d6e

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



Change-Id: I7aef4a1090fd3f2b378fe97d276ac65dd293c3cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04f0ef25 830e2d6e

fastboot/fastboot.cpp

+12 −5
Original line number Diff line number Diff line
@@ -1413,12 +1413,19 @@ void do_for_partitions(const std::string& part, const std::string& slot, 
    }

}



bool is_retrofit_device(fastboot::IFastBootDriver* fb) {

    std::string value;

    if (fb->GetVar("super-partition-name", &value) != fastboot::SUCCESS) {

bool is_retrofit_device(const ImageSource* source) {

    // Does this device use dynamic partitions at all?

    std::vector<char> contents;

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

        return false;

    }

    return android::base::StartsWith(value, "system_");

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

    for (const auto& partition : metadata->partitions) {

        if (partition.attributes & LP_PARTITION_ATTR_SLOT_SUFFIXED) {

            return true;

        }

    }

    return false;

}



// Fetch a partition from the device to a given fd. This is a wrapper over FetchToFd to fetch
@@ -1876,7 +1883,7 @@ std::vector<std::unique_ptr<Task>> FlashAllTool::CollectTasksFromImageList() { 
        // On these devices, secondary slots must be flashed as physical

        // partitions (otherwise they would not mount on first boot). To enforce

        // this, we delete any logical partitions for the "other" slot.

        if (is_retrofit_device(fp_->fb)) {

        if (is_retrofit_device(fp_->source)) {

            std::string partition_name = image->part_name + "_" + slot;

            if (image->IsSecondary() && should_flash_in_userspace(partition_name)) {

                tasks.emplace_back(std::make_unique<DeleteTask>(fp_, partition_name));

fastboot/fastboot.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int64_t get_sparse_limit(int64_t size, const FlashingPlan* fp); 
std::vector<SparsePtr> resparse_file(sparse_file* s, int64_t max_size);



bool supports_AB(fastboot::IFastBootDriver* fb);

bool is_retrofit_device(fastboot::IFastBootDriver* fb);

bool is_retrofit_device(const ImageSource* source);

bool is_logical(const std::string& partition);

void fb_perform_format(const std::string& partition, int skip_if_not_supported,

                       const std::string& type_override, const std::string& size_override,