openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9 

am: 4727930bff

Change-Id: If73915a15fa675ca635588c99bc4e6ed56e4be05
This commit is contained in:
Tao Bao 2017-11-18 00:44:28 +00:00 committed by android-build-merger
parent 99dc51da38 4727930bff
commit 497862c757
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tools/releasetools/add_img_to_target_files.py
View File

@ -350,6 +350,10 @@ def AddVBMeta(output_zip, boot_img_path, system_img_path, vendor_img_path,
dtbo_img_path, prefix="IMAGES/"): dtbo_img_path, prefix="IMAGES/"):
"""Create a VBMeta image and store it in output_zip.""" """Create a VBMeta image and store it in output_zip."""
img = OutputFile(output_zip, OPTIONS.input_tmp, prefix, "vbmeta.img") img = OutputFile(output_zip, OPTIONS.input_tmp, prefix, "vbmeta.img")
if os.path.exists(img.input_name):
print("vbmeta.img already exists in %s; not rebuilding..." % (prefix,))
return img.input_name
avbtool = os.getenv('AVBTOOL') or OPTIONS.info_dict["avb_avbtool"] avbtool = os.getenv('AVBTOOL') or OPTIONS.info_dict["avb_avbtool"]
cmd = [avbtool, "make_vbmeta_image", "--output", img.name] cmd = [avbtool, "make_vbmeta_image", "--output", img.name]
common.AppendAVBSigningArgs(cmd, "vbmeta") common.AppendAVBSigningArgs(cmd, "vbmeta")
@ -529,53 +533,43 @@ def AddImagesToTargetFiles(filename):
def banner(s): def banner(s):
print("\n\n++++ " + s + " ++++\n\n") print("\n\n++++ " + s + " ++++\n\n")
prebuilt_path = os.path.join(OPTIONS.input_tmp, "IMAGES", "boot.img") banner("boot")
boot_image = None # common.GetBootableImage() returns the image directly if present.
if os.path.exists(prebuilt_path): boot_image = common.GetBootableImage(
banner("boot") "IMAGES/boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")
print("boot.img already exists in IMAGES/, no need to rebuild...") # boot.img may be unavailable in some targets (e.g. aosp_arm64).
if OPTIONS.rebuild_recovery: if boot_image:
boot_image = common.GetBootableImage( boot_img_path = os.path.join(OPTIONS.input_tmp, "IMAGES", "boot.img")
"IMAGES/boot.img", "boot.img", OPTIONS.input_tmp, "BOOT") if not os.path.exists(boot_img_path):
else: boot_image.WriteToDir(OPTIONS.input_tmp)
banner("boot")
boot_image = common.GetBootableImage(
"IMAGES/boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")
if boot_image:
if output_zip: if output_zip:
boot_image.AddToZip(output_zip) boot_image.AddToZip(output_zip)
else:
boot_image.WriteToDir(OPTIONS.input_tmp)
recovery_image = None recovery_image = None
if has_recovery: if has_recovery:
banner("recovery") banner("recovery")
prebuilt_path = os.path.join(OPTIONS.input_tmp, "IMAGES", "recovery.img") recovery_image = common.GetBootableImage(
if os.path.exists(prebuilt_path): "IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")
print("recovery.img already exists in IMAGES/, no need to rebuild...") assert recovery_image, "Failed to create recovery.img."
if OPTIONS.rebuild_recovery: recovery_img_path = os.path.join(
recovery_image = common.GetBootableImage( OPTIONS.input_tmp, "IMAGES", "recovery.img")
"IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, if not os.path.exists(recovery_img_path):
"RECOVERY") recovery_image.WriteToDir(OPTIONS.input_tmp)
else: if output_zip:
recovery_image = common.GetBootableImage( recovery_image.AddToZip(output_zip)
"IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")
if recovery_image:
if output_zip:
recovery_image.AddToZip(output_zip)
else:
recovery_image.WriteToDir(OPTIONS.input_tmp)
banner("recovery (two-step image)") banner("recovery (two-step image)")
# The special recovery.img for two-step package use. # The special recovery.img for two-step package use.
recovery_two_step_image = common.GetBootableImage( recovery_two_step_image = common.GetBootableImage(
"IMAGES/recovery-two-step.img", "recovery-two-step.img", "IMAGES/recovery-two-step.img", "recovery-two-step.img",
OPTIONS.input_tmp, "RECOVERY", two_step_image=True) OPTIONS.input_tmp, "RECOVERY", two_step_image=True)
if recovery_two_step_image: assert recovery_two_step_image, "Failed to create recovery-two-step.img."
recovery_two_step_image_path = os.path.join(
OPTIONS.input_tmp, "IMAGES", "recovery-two-step.img")
if not os.path.exists(recovery_two_step_image_path):
recovery_two_step_image.WriteToDir(OPTIONS.input_tmp)
if output_zip: if output_zip:
recovery_two_step_image.AddToZip(output_zip) recovery_two_step_image.AddToZip(output_zip)
else:
recovery_two_step_image.WriteToDir(OPTIONS.input_tmp)
banner("system") banner("system")
system_img_path = AddSystem( system_img_path = AddSystem(
@ -604,9 +598,8 @@ def AddImagesToTargetFiles(filename):
if OPTIONS.info_dict.get("avb_enable") == "true": if OPTIONS.info_dict.get("avb_enable") == "true":
banner("vbmeta") banner("vbmeta")
boot_contents = boot_image.WriteToTemp() AddVBMeta(output_zip, boot_img_path, system_img_path, vendor_img_path,
AddVBMeta(output_zip, boot_contents.name, system_img_path, dtbo_img_path)
vendor_img_path, dtbo_img_path)
# For devices using A/B update, copy over images from RADIO/ and/or # For devices using A/B update, copy over images from RADIO/ and/or
# VENDOR_IMAGES/ to IMAGES/ and make sure we have all the needed # VENDOR_IMAGES/ to IMAGES/ and make sure we have all the needed