diff options
| author | Tao Bao <tbao@google.com> | 2015-07-29 21:58:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 21:58:06 +0000 |
| commit | 15b42c426715c2221f49d0cf2181ba869b84bc94 (patch) | |
| tree | 567c252df70d22dd97bb261cd0f5b9b7a065d02e /tools/releasetools | |
| parent | b7a3bc569cf8bc928391440db5113dc8f1f12399 (diff) | |
| parent | cce673b675fadb9e509779cec838a1b545126cc4 (diff) | |
| download | build-15b42c426715c2221f49d0cf2181ba869b84bc94.zip build-15b42c426715c2221f49d0cf2181ba869b84bc94.tar.gz build-15b42c426715c2221f49d0cf2181ba869b84bc94.tar.bz2 | |
am cce673b6: Read fstab from the source build.
* commit 'cce673b675fadb9e509779cec838a1b545126cc4':
Read fstab from the source build.
Diffstat (limited to 'tools/releasetools')
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 82d6313..531a728 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -832,9 +832,9 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): # (allow recovery to mark itself finished and reboot) if OPTIONS.two_step: - if not OPTIONS.info_dict.get("multistage_support", None): + if not OPTIONS.source_info_dict.get("multistage_support", None): assert False, "two-step packages not supported by this build" - fs = OPTIONS.info_dict["fstab"]["/misc"] + fs = OPTIONS.source_info_dict["fstab"]["/misc"] assert fs.fs_type.upper() == "EMMC", \ "two-step packages only supported on devices with EMMC /misc partitions" bcb_dev = {"bcb_dev": fs.device} @@ -879,7 +879,8 @@ else if get_stage("%(bcb_dev)s") != "3/3" then GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) if updating_boot: - boot_type, boot_device = common.GetTypeAndDevice("/boot", OPTIONS.info_dict) + boot_type, boot_device = common.GetTypeAndDevice( + "/boot", OPTIONS.source_info_dict) d = common.Difference(target_boot, source_boot) _, _, d = d.ComputePatch() if d is None: @@ -1218,9 +1219,9 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): # (allow recovery to mark itself finished and reboot) if OPTIONS.two_step: - if not OPTIONS.info_dict.get("multistage_support", None): + if not OPTIONS.source_info_dict.get("multistage_support", None): assert False, "two-step packages not supported by this build" - fs = OPTIONS.info_dict["fstab"]["/misc"] + fs = OPTIONS.source_info_dict["fstab"]["/misc"] assert fs.fs_type.upper() == "EMMC", \ "two-step packages only supported on devices with EMMC /misc partitions" bcb_dev = {"bcb_dev": fs.device} @@ -1257,7 +1258,8 @@ else if get_stage("%(bcb_dev)s") != "3/3" then common.ZipWriteStr(output_zip, "patch/boot.img.p", d) - boot_type, boot_device = common.GetTypeAndDevice("/boot", OPTIONS.info_dict) + boot_type, boot_device = common.GetTypeAndDevice( + "/boot", OPTIONS.source_info_dict) script.PatchCheck("%s:%s:%d:%s:%d:%s" % (boot_type, boot_device, |