summaryrefslogtreecommitdiffstats
path: root/tools/releasetools/ota_from_target_files
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-08-18 14:28:42 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:34:16 -0700
commit2c8c14ebcdaabe620181cf10bc7cc67760eb4b63 (patch)
tree403bb71be875e175a4abc842a27e83540e93103d /tools/releasetools/ota_from_target_files
parentc2467343801228fd5560d64f5312e45384425f5c (diff)
downloadbuild-2c8c14ebcdaabe620181cf10bc7cc67760eb4b63.zip
build-2c8c14ebcdaabe620181cf10bc7cc67760eb4b63.tar.gz
build-2c8c14ebcdaabe620181cf10bc7cc67760eb4b63.tar.bz2
ota_from_target_files: Validate signatures after possible data wipe
If the data is being wiped, we want to validate the signature after this step. This is also a good check that the data wipe succeeded. Change-Id: Iaecfddfb2010944de0c97e7bb21d8e581f20deec
Diffstat (limited to 'tools/releasetools/ota_from_target_files')
-rwxr-xr-xtools/releasetools/ota_from_target_files14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
index 9db2019..015fb39 100755
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -586,13 +586,6 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
device_specific.FullOTA_InstallBegin()
- if block_based:
- common.ZipWriteStr(output_zip, "system/bin/otasigcheck.sh",
- ""+input_zip.read("SYSTEM/bin/otasigcheck.sh"))
- script.Mount("/data")
- script.ValidateSignatures("data")
- script.Unmount("/data")
-
if OPTIONS.backuptool:
if block_based:
common.ZipWriteStr(output_zip, "system/bin/backuptool.sh",
@@ -608,6 +601,13 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
if HasVendorPartition(input_zip):
system_progress -= 0.1
+ if block_based:
+ common.ZipWriteStr(output_zip, "system/bin/otasigcheck.sh",
+ ""+input_zip.read("SYSTEM/bin/otasigcheck.sh"))
+ script.Mount("/data")
+ script.ValidateSignatures("data")
+ script.Unmount("/data")
+
if "selinux_fc" in OPTIONS.info_dict:
WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip)