StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Track edify function API changes.

Browse Source 
In particular, it replaces the generated calls to edify function of
`apply_patch()` and `apply_patch_check()` with `patch_partition()` and
`patch_partition_check()` instead.

It adds two functions to EdifyGenerator: PatchPartition() and
PatchPartitionCheck() for Python releasetools callers. It also tries to
handle the callers of obsolete EdifyGenerator.PatchCheck() and
EdifyGenerator.ApplyPatch(), if their inputs are in known format.
Otherwise it raises an exception to avoid generating an OTA that updater
doesn't understand.

It requires the matching updater changes in the same topic.

Bug: 110106408
Test: Generate an incremental package with the new script and updater.
      Apply the package on device.
Test: Revert the change in ota_from_target_files.py, so that it calls
      the obsolete EdifyGenerator functions. Check that it generates the
      same incremental package.
Change-Id: Ifc55cb40d3a45116fd4d408536d037eca249effa
This commit is contained in:
Tao Bao
2018-08-26 11:53:15 -07:00
parent 04552fed3b
commit 5121655643
2 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/releasetools/ota_from_target_files.py
View File

@@ -1523,18 +1523,14 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
print("boot target: %d source: %d diff: %d" % (
target_boot.size, source_boot.size, len(d)))
common.ZipWriteStr(output_zip, "patch/boot.img.p", d)
common.ZipWriteStr(output_zip, "boot.img.p", d)
script.PatchPartitionCheck(
"{}:{}:{}:{}".format(
boot_type, boot_device, target_boot.size, target_boot.sha1),
"{}:{}:{}:{}".format(
boot_type, boot_device, source_boot.size, source_boot.sha1))
# TODO(b/110106408): Remove after properly handling the SHA-1 embedded in
# the filename argument in updater code. Prior to that, explicitly list
# the SHA-1 of the source image, in case the updater tries to find a
# matching backup from /cache. Similarly for the call to
# script.ApplyPatch() below.
script.PatchCheck("%s:%s:%d:%s:%d:%s" %
(boot_type, boot_device,
source_boot.size, source_boot.sha1,
target_boot.size, target_boot.sha1),
source_boot.sha1)
size.append(target_boot.size)
if size:
@@ -1590,13 +1586,12 @@ else
print("boot image changed; including patch.")
script.Print("Patching boot image...")
script.ShowProgress(0.1, 10)
script.ApplyPatch("%s:%s:%d:%s:%d:%s"
% (boot_type, boot_device,
source_boot.size, source_boot.sha1,
target_boot.size, target_boot.sha1),
"-",
target_boot.size, target_boot.sha1,
source_boot.sha1, "patch/boot.img.p")
script.PatchPartition(
'{}:{}:{}:{}'.format(
boot_type, boot_device, target_boot.size, target_boot.sha1),
'{}:{}:{}:{}'.format(
boot_type, boot_device, source_boot.size, source_boot.sha1),
'boot.img.p')
else:
print("boot image unchanged; skipping.")