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

Commit 6471b231 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Look for radio.img and bootloader.img in ANDROID_PRODUCT_OUT" into main am: 1c77579a 

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



Change-Id: I15feb6104e468b591208d1f966c00a9a8df1cb97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a4764fa 1c77579a

fastboot/fastboot.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,9 @@ fastboot::FastBootDriver* fb = nullptr; 
static std::vector<Image> images = {

static std::vector<Image> images = {

        // clang-format off

        // clang-format off

    { "boot",     "boot.img",         "boot.sig",     "boot",     false, ImageType::BootCritical },

    { "boot",     "boot.img",         "boot.sig",     "boot",     false, ImageType::BootCritical },

    { "bootloader",

                  "bootloader.img",   "",             "bootloader",

                                                                  true,  ImageType::Extra },

    { "init_boot",

    { "init_boot",

                  "init_boot.img",    "init_boot.sig",

                  "init_boot.img",    "init_boot.sig",

                                                      "init_boot",

                                                      "init_boot",
@@ -132,6 +135,7 @@ static std::vector<Image> images = { 
    { "odm_dlkm", "odm_dlkm.img",     "odm_dlkm.sig", "odm_dlkm", true,  ImageType::Normal },

    { "odm_dlkm", "odm_dlkm.img",     "odm_dlkm.sig", "odm_dlkm", true,  ImageType::Normal },

    { "product",  "product.img",      "product.sig",  "product",  true,  ImageType::Normal },

    { "product",  "product.img",      "product.sig",  "product",  true,  ImageType::Normal },

    { "pvmfw",    "pvmfw.img",        "pvmfw.sig",    "pvmfw",    true,  ImageType::BootCritical },

    { "pvmfw",    "pvmfw.img",        "pvmfw.sig",    "pvmfw",    true,  ImageType::BootCritical },

    { "radio",    "radio.img",        "",             "radio",    true,  ImageType::Extra },

    { "recovery", "recovery.img",     "recovery.sig", "recovery", true,  ImageType::BootCritical },

    { "recovery", "recovery.img",     "recovery.sig", "recovery", true,  ImageType::BootCritical },

    { "super",    "super.img",        "super.sig",    "super",    true,  ImageType::Extra },

    { "super",    "super.img",        "super.sig",    "super",    true,  ImageType::Extra },

    { "system",   "system.img",       "system.sig",   "system",   false, ImageType::Normal },

    { "system",   "system.img",       "system.sig",   "system",   false, ImageType::Normal },