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

Commit c6904fea authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-1413808-modules_partition-UXSIXCGPHZ" am:... 

Merge changes from topic "revert-1413808-modules_partition-UXSIXCGPHZ" am: 4fd78ec4 am: d63c395c am: ccebe1b9 am: e527ca25

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

Change-Id: Ibca17e6071feed13de6ef93dc2f412f8f7309208
parents d62d3c0b e527ca25

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 modules odm odm_dlkm oem product radio recovery system vbmeta vendor vendor_dlkm"

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

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

    else

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

fastboot/fastboot.cpp

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static Image images[] = { 
    { "cache",    "cache.img",        "cache.sig",    "cache",    true,  ImageType::Extra },

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

    { "dts",      "dt.img",           "dt.sig",       "dts",      true,  ImageType::BootCritical },

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

    { "odm",      "odm.img",          "odm.sig",      "odm",      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 },

rootdir/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -141,9 +141,6 @@ LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/odm_dlkm 
# via /odm/lib/modules directly.

LOCAL_POST_INSTALL_CMD += ; ln -sf /odm/odm_dlkm/etc $(TARGET_ROOT_OUT)/odm_dlkm/etc



# For /modules partition.

LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/modules



ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE

  LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache

else