From 9d8b59fb3701c2154d359a83ea7314f9897c731e Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Mon, 18 Aug 2014 14:28:42 -0700 Subject: 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 (cherry picked from commit 43795266f635aa6674f0b6ecc3f4ccc5660a8de1) --- tools/releasetools/ota_from_target_files | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 1664575..beaabc6 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -511,10 +511,6 @@ else if get_stage("%(bcb_dev)s", "stage") == "3/3" then device_specific.FullOTA_InstallBegin() - script.Mount("/data") - script.ValidateSignatures("data") - script.Unmount("/data") - if OPTIONS.backuptool: script.Mount("/system") script.RunBackup("backup") @@ -525,6 +521,10 @@ else if get_stage("%(bcb_dev)s", "stage") == "3/3" then if OPTIONS.wipe_user_data: script.FormatPartition("/data") + script.Mount("/data") + script.ValidateSignatures("data") + script.Unmount("/data") + if "selinux_fc" in OPTIONS.info_dict: WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip) -- cgit v1.1