diff options
| author | Doug Zongker <dougz@android.com> | 2009-10-07 17:05:36 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2009-10-07 17:05:36 -0700 |
| commit | f2b32f2a4b7279a92ef0870277bc99c659ee28f4 (patch) | |
| tree | d7040cc938eeefc54c172c0a045718c64906c1cc /tools/releasetools | |
| parent | 979d5567b72b4f3a8219b4786f9f512601645121 (diff) | |
| parent | cfd7db6d8494c7d3169a4eac0dc63737a24ff1d1 (diff) | |
| download | build-f2b32f2a4b7279a92ef0870277bc99c659ee28f4.zip build-f2b32f2a4b7279a92ef0870277bc99c659ee28f4.tar.gz build-f2b32f2a4b7279a92ef0870277bc99c659ee28f4.tar.bz2 | |
resolved conflicts for merge of cfd7db6d to eclair
Diffstat (limited to 'tools/releasetools')
| -rwxr-xr-x | tools/releasetools/ota_from_target_files | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index e719696..f129da1 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -302,7 +302,7 @@ def MakeRecoveryPatch(output_zip, recovery_img, boot_img): d = Difference(recovery_img, boot_img) _, _, patch = d.ComputePatch() - common.ZipWriteStr(output_zip, "system/recovery-from-boot.p", patch) + common.ZipWriteStr(output_zip, "recovery/recovery-from-boot.p", patch) Item.Get("system/recovery-from-boot.p", dir=False) # Images with different content will have a different first page, so @@ -323,7 +323,7 @@ fi 'header_sha1': header_sha1, 'recovery_size': recovery_img.size, 'recovery_sha1': recovery_img.sha1 } - common.ZipWriteStr(output_zip, "system/etc/install-recovery.sh", sh) + common.ZipWriteStr(output_zip, "recovery/etc/install-recovery.sh", sh) return Item.Get("system/etc/install-recovery.sh", dir=False) @@ -358,6 +358,7 @@ def WriteFullOTAPackage(input_zip, output_zip): script.FormatPartition("system") script.Mount("MTD", "system", "/system") + script.UnpackPackageDir("recovery", "/system") script.UnpackPackageDir("system", "/system") symlinks = CopySystemFiles(input_zip, output_zip) @@ -745,6 +746,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): # as fodder for constructing the recovery image. recovery_sh_item = MakeRecoveryPatch(output_zip, target_recovery, target_boot) + script.UnpackPackageDir("recovery", "/system") print "recovery image changed; including as patch from boot." else: print "recovery image unchanged; skipping." |