p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8eb7f45a: am 4ac8e059: Merge "Read fstab from the source build." 

* commit '8eb7f45a45132cfb39258b383f8ed06c7c4212ce':
  Read fstab from the source build.
This commit is contained in:
Tao Bao 2015-07-29 21:53:48 +00:00 committed by Android Git Automerger
parent fbfa983a59 8eb7f45a45
commit 17f8f36875
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/ota_from_target_files.py
View File

@ -838,9 +838,9 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
# (allow recovery to mark itself finished and reboot) # (allow recovery to mark itself finished and reboot)
if OPTIONS.two_step: 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" 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", \ assert fs.fs_type.upper() == "EMMC", \
"two-step packages only supported on devices with EMMC /misc partitions" "two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
@ -885,7 +885,8 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict))
if updating_boot: 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 = common.Difference(target_boot, source_boot)
_, _, d = d.ComputePatch() _, _, d = d.ComputePatch()
if d is None: if d is None:
@ -1225,9 +1226,9 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
# (allow recovery to mark itself finished and reboot) # (allow recovery to mark itself finished and reboot)
if OPTIONS.two_step: 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" 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", \ assert fs.fs_type.upper() == "EMMC", \
"two-step packages only supported on devices with EMMC /misc partitions" "two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
@ -1264,7 +1265,8 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
common.ZipWriteStr(output_zip, "patch/boot.img.p", d) 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" % script.PatchCheck("%s:%s:%d:%s:%d:%s" %
(boot_type, boot_device, (boot_type, boot_device,