diff options
| author | Jesse Zhao <jessezhao@google.com> | 2015-01-28 23:30:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-28 23:30:54 +0000 |
| commit | 0c9384d512cab94b761dcb82325e4411cbaf52c0 (patch) | |
| tree | b38f377bbb277045c1acf9dd4bce401dfe4a040e /tools/releasetools/ota_from_target_files | |
| parent | cb73599b25098b3513feda11ca5cb17d77fec83e (diff) | |
| parent | 75bcea0267ae94ef865de60d2e40a99f7a65e998 (diff) | |
| download | build-0c9384d512cab94b761dcb82325e4411cbaf52c0.zip build-0c9384d512cab94b761dcb82325e4411cbaf52c0.tar.gz build-0c9384d512cab94b761dcb82325e4411cbaf52c0.tar.bz2 | |
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
Diffstat (limited to 'tools/releasetools/ota_from_target_files')
| -rwxr-xr-x | tools/releasetools/ota_from_target_files | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 755e5c2..945f11a 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -558,6 +558,7 @@ else if get_stage("%(bcb_dev)s") == "3/3" then system_items = ItemSet("system", "META/filesystem_config.txt") script.ShowProgress(system_progress, 0) + if block_based: # Full OTA is done as an "incremental" against an empty source # image. This has the effect of writing new data from the package @@ -845,6 +846,11 @@ reboot_now("%(bcb_dev)s", ""); else """ % bcb_dev) + # Verify the existing partitions. + system_diff.WriteVerifyScript(script) + if vendor_diff: + vendor_diff.WriteVerifyScript(script) + script.Comment("---- start making changes here ----") device_specific.IncrementalOTA_InstallBegin() |