| author | Jacky Liu <qsliu@google.com> | 2020-06-03 08:41:27 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-06-03 08:41:27 (GMT) |
| commit | a60886b306857dc6ca31a5de97ea06ab7278cc37 (patch) | |
| tree | b3447e3d02bfc519dbc4c40cb943db79ae3073cd | |
| parent | 4f57475bb23ed8e5e48027e8c70b14d5d4795125 (diff) | |
| parent | e31eaa0ba92dcc30bc571659fc1b75ea012fa193 (diff) | |
| download | common-a60886b306857dc6ca31a5de97ea06ab7278cc37.zip common-a60886b306857dc6ca31a5de97ea06ab7278cc37.tar.gz common-a60886b306857dc6ca31a5de97ea06ab7278cc37.tar.bz2 | |
Merge "Flash super in flash-all.sh to cover parttion change" into q-tv-r1-dev
| -rwxr-xr-x | flash-all-dynamic.bat | 1 | ||||
| -rwxr-xr-x | flash-all-dynamic.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/flash-all-dynamic.bat b/flash-all-dynamic.bat index e1889f1..f588f12 100755 --- a/flash-all-dynamic.bat +++ b/flash-all-dynamic.bat @@ -37,6 +37,7 @@ fastboot flash boot boot.img fastboot flash recovery recovery.img fastboot reboot fastboot ping -n 10 127.0.0.1 >nul +fastboot flash super super_empty_all.img fastboot flash odm odm.img fastboot flash system system.img fastboot flash vendor vendor.img diff --git a/flash-all-dynamic.sh b/flash-all-dynamic.sh index 3559a3e..eeb5988 100755 --- a/flash-all-dynamic.sh +++ b/flash-all-dynamic.sh @@ -41,7 +41,7 @@ fi function flash_with_retry() { local partition=${1}; local img=${2}; - msg=$(fastboot ${sern} flash ${partition} ${img} 2>&1) + msg=$(fastboot ${sern} flash ${partition} ${img} 2>&1 || true) echo "${msg}" if [[ ${msg} =~ 'FAILED' ]]; then echo "\nFlashing ${img} is not done properly. Do it again." @@ -75,6 +75,7 @@ flash_with_retry recovery recovery.img fastboot $sern reboot fastboot sleep 10 +flash_with_retry super super_empty_all.img flash_with_retry odm odm.img flash_with_retry system system.img flash_with_retry vendor vendor.img |