ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I15feb6104e468b591208d1f966c00a9a8df1cb97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-07-17 22:33:56 +00:00 • committed by Automerger Merge Worker
commit 6471b231d7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fastboot/fastboot.cpp
View file

@ -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 },