summaryrefslogtreecommitdiff
authorDan Zhang <danielzhang@google.com>2019-12-26 08:24:06 (GMT)
committer Android Partner Code Review <android-gerrit-partner@google.com>2019-12-26 08:24:06 (GMT)
commit94b44afdc3f0e49e78590a30005420e6719cd9f4 (patch)
tree629b61b2604cd67a80ae72edd46e0f729e20666c
parent06b812d37f7f4bf16367e0039ce68872455d2f4d (diff)
parentaa90bfff51c9cc1cb2de44d7aed947920e6d2b42 (diff)
downloadcommon-94b44afdc3f0e49e78590a30005420e6719cd9f4.zip
common-94b44afdc3f0e49e78590a30005420e6719cd9f4.tar.gz
common-94b44afdc3f0e49e78590a30005420e6719cd9f4.tar.bz2
Merge "ota: format data partiton [1/1]" into q-tv-dev
Diffstat
-rwxr-xr-xreleasetools.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/releasetools.py b/releasetools.py
index 6103ef2..ed5ec2c 100755
--- a/releasetools.py
+++ b/releasetools.py
@@ -218,12 +218,14 @@ 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"));')
- info.script.AppendExtra('if get_update_stage() == "2" then')
+ #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.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")