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

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

Merge "fastboot: Add system_dlkm flashing support" am: 57852979 am: 9a3cf308 am: 152c0607 

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

Change-Id: I4c26beab44959695885a473044e2a8150c741df0
parents d943b5c4 152c0607

fastboot/fastboot.bash

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ _fastboot_cmd_flash() { 


    cur="${COMP_WORDS[COMP_CWORD]}"

    if [[ $i -eq $COMP_CWORD ]]; then

        partitions="boot bootloader dtbo modem odm odm_dlkm oem product pvmfw radio recovery system vbmeta vendor vendor_dlkm"

        partitions="boot bootloader dtbo modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm"

        COMPREPLY=( $(compgen -W "$partitions" -- $cur) )

    else

        _fastboot_util_complete_local_file "${cur}" '!*.img'

fastboot/fastboot.cpp

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ static Image images[] = { 
    { "recovery", "recovery.img",     "recovery.sig", "recovery", true,  ImageType::BootCritical },

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

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

    { "system_dlkm",

                  "system_dlkm.img",  "system_dlkm.sig",

                                                      "system_dlkm",

                                                                  true,  ImageType::Normal },

    { "system_ext",

                  "system_ext.img",   "system_ext.sig",

                                                      "system_ext",