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

Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 am: a551c5d3d1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I03570bb204f5d4f5a8c00a45c4867a859661f00a
This commit is contained in:
Treehugger Robot
2022-01-07 03:06:08 +00:00
committed by Automerger Merge Worker
parent 098bfa13e2 a551c5d3d1
commit 2ba4030ac0
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/releasetools/common.py
View File

@@ -1699,8 +1699,8 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name,
Args:
image_path: The full path of the image, e.g., /path/to/boot.img.
prebuilt_name: The prebuilt image name, e.g., boot.img, boot-5.4-gz.img,
boot-5.10.img, recovery.img.
partition_name: The partition name, e.g., 'boot' or 'recovery'.
boot-5.10.img, recovery.img or init_boot.img.
partition_name: The partition name, e.g., 'boot', 'init_boot' or 'recovery'.
info_dict: The information dict read from misc_info.txt.
"""
if info_dict is None:
@@ -1724,6 +1724,35 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name,
RunAndCheckOutput(cmd)
def HasRamdisk(partition_name, info_dict=None):
"""Returns true/false to see if a bootable image should have a ramdisk.
Args:
partition_name: The partition name, e.g., 'boot', 'init_boot' or 'recovery'.
info_dict: The information dict read from misc_info.txt.
"""
if info_dict is None:
info_dict = OPTIONS.info_dict
if partition_name != "boot":
return True # init_boot.img or recovery.img has a ramdisk.
if info_dict.get("recovery_as_boot") == "true":
return True # the recovery-as-boot boot.img has a RECOVERY ramdisk.
if info_dict.get("system_root_image") == "true":
# The ramdisk content is merged into the system.img, so there is NO
# ramdisk in the boot.img or boot-<kernel version>.img.
return False
if info_dict.get("init_boot") == "true":
# The ramdisk is moved to the init_boot.img, so there is NO
# ramdisk in the boot.img or boot-<kernel version>.img.
return False
return True
def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
info_dict=None, two_step_image=False):
"""Return a File object with the desired bootable image.
@@ -1745,25 +1774,18 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
logger.info("using prebuilt %s from IMAGES...", prebuilt_name)
return File.FromLocalFile(name, prebuilt_path)
partition_name = tree_subdir.lower()
prebuilt_path = os.path.join(unpack_dir, "PREBUILT_IMAGES", prebuilt_name)
if os.path.exists(prebuilt_path):
logger.info("Re-signing prebuilt %s from PREBUILT_IMAGES...", prebuilt_name)
signed_img = MakeTempFile()
shutil.copy(prebuilt_path, signed_img)
partition_name = tree_subdir.lower()
_SignBootableImage(signed_img, prebuilt_name, partition_name, info_dict)
return File.FromLocalFile(name, signed_img)
logger.info("building image from target_files %s...", tree_subdir)
# With system_root_image == "true", we don't pack ramdisk into the boot image.
# With init_boot == "true", we don't pack the ramdisk into boot.img.
# Unless "recovery_as_boot" is specified, in which case we carry the ramdisk
# for recovery.
has_ramdisk = ((info_dict.get("system_root_image") != "true" and
info_dict.get("init_boot") != "true") or
prebuilt_name != "boot.img" or
info_dict.get("recovery_as_boot") == "true")
has_ramdisk = HasRamdisk(partition_name, info_dict)
fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
data = _BuildBootableImage(prebuilt_name, os.path.join(unpack_dir, tree_subdir),