diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-08-18 14:28:42 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-04 18:24:07 +0000 |
| commit | 9d8b59fb3701c2154d359a83ea7314f9897c731e (patch) | |
| tree | 74cc5ad1b9ce34c1a13541f762f7dd0ca29c047f | |
| parent | 8b6ded9867073230b1601c1d5eeda0a70a5254d9 (diff) | |
| download | replicant_build-9d8b59fb3701c2154d359a83ea7314f9897c731e.zip replicant_build-9d8b59fb3701c2154d359a83ea7314f9897c731e.tar.gz replicant_build-9d8b59fb3701c2154d359a83ea7314f9897c731e.tar.bz2 | |
ota_from_target_files: Validate signatures after possible data wipecm-11.0-XNPH44S-bacon-5fa8c79c0b
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)
| -rwxr-xr-x | tools/releasetools/ota_from_target_files | 8 |
1 files 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) |