| author | Ben Cheng <bccheng@google.com> | 2020-01-02 02:16:40 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-01-02 02:16:40 (GMT) |
| commit | b9caac048cfa806b963a7414ad3aa316245f1472 (patch) | |
| tree | 5d0cd7620b521c15c721da724a7c09e74874d011 | |
| parent | af23e76716aec14b0da1d65459f8a5d7cb6d00dd (diff) | |
| parent | 717ee9e8aadedd5782c0ac50e04337f012d09a8a (diff) | |
| download | common-b9caac048cfa806b963a7414ad3aa316245f1472.zip common-b9caac048cfa806b963a7414ad3aa316245f1472.tar.gz common-b9caac048cfa806b963a7414ad3aa316245f1472.tar.bz2 | |
Merge "Revert "ota: format data partiton [1/1]"" into q-tv-dev
| -rwxr-xr-x | releasetools.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/releasetools.py b/releasetools.py index ed5ec2c..6103ef2 100755 --- a/releasetools.py +++ b/releasetools.py @@ -218,14 +218,12 @@ package_extract_file("vbmeta.img", "/dev/block/vbmeta");""") info.script.AppendExtra('ui_print("update bootloader.img...");') info.script.AppendExtra('write_bootloader_image(package_extract_file("bootloader.img"));') - #TODO: this is a temp solution for keymaster ta updated - #TODO: need uncomment back next time after keymaster ta updated - #info.script.AppendExtra('if get_update_stage() == "2" then') + info.script.AppendExtra('if get_update_stage() == "2" then') info.script.FormatPartition("/tee") info.script.AppendExtra('wipe_cache();') info.script.FormatPartition("/data") info.script.AppendExtra('set_update_stage("0");') - #info.script.AppendExtra('endif;') + info.script.AppendExtra('endif;') SetBootloaderEnv(info.script, "upgrade_step", "1") SetBootloaderEnv(info.script, "force_auto_update", "false") |