From 7af7910e780ca7d059681862aa3b0bdd19c9bb4e Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 5 Apr 2019 15:18:39 -0400 Subject: [PATCH] Revert "Revert to old find boot order" This reverts commit 5203886f0bc535e913b17fe2adbc83beb85df6b9. --- .gitignore | 1 - scripts/util_functions.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d738d0bae..47cd35844 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ out *.apk config.prop update.sh -/.vscode # Built binaries native/out diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 000be0347..b40617f7a 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -237,7 +237,7 @@ find_boot_image() { elif [ ! -z $SLOT ]; then BOOTIMAGE=`find_block ramdisk$SLOT recovery_ramdisk$SLOT boot$SLOT` else - BOOTIMAGE=`find_block ramdisk recovery_ramdisk boot boot_a kern-a android_boot kernel lnx bootimg` + BOOTIMAGE=`find_block ramdisk recovery_ramdisk kern-a android_boot kernel boot lnx bootimg boot_a` fi if [ -z $BOOTIMAGE ]; then # Lets see what fstabs tells me