From 0d4a6887fb5f0232b315448c74aad80abfebd066 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 15 Sep 2020 19:07:39 +0000 Subject: [PATCH] Revert "fastboot: add modules partition" Revert submission 1413808-modules_partition Reason for revert: modules partition no longer needed Reverted Changes: Iceafebd85:Add modules partition I2fa96199a:rootdir: Add modules directory Ie397b9ec6:Add modules partition. I4200d0cf5:fastboot: add modules partition Bug: 163543381 Change-Id: I17dc2da5a0901797c1bc1905274e7eb02e80fd83 --- fastboot/fastboot.bash | 2 +- fastboot/fastboot.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fastboot/fastboot.bash b/fastboot/fastboot.bash index a46f4201b4..406e8b8d78 100644 --- a/fastboot/fastboot.bash +++ b/fastboot/fastboot.bash @@ -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' diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 3969367b0f..d33c987704 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -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 }, -- GitLab