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

Move GetCareMap from common.py to add_img_to_target_files.py

Browse Source 
common.py is too big, break it down if possible

Test: th
Bug: 246504616
Change-Id: Ic1c1f11b53673419558137dffc2e233eeafff2c1
This commit is contained in:
Kelvin Zhang
2022-10-06 14:21:36 -07:00
parent 566aa5d177
commit f294c87cfe
3 changed files with 169 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
tools/releasetools/common.py
View File

@@ -1195,7 +1195,7 @@ def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict):
return " ".join(sorted(combined))
if (framework_dict.get("use_dynamic_partitions") !=
"true") or (vendor_dict.get("use_dynamic_partitions") != "true"):
"true") or (vendor_dict.get("use_dynamic_partitions") != "true"):
raise ValueError("Both dictionaries must have use_dynamic_partitions=true")
merged_dict = {"use_dynamic_partitions": "true"}
@@ -1682,7 +1682,6 @@ def _BuildBootableImage(image_name, sourcedir, fs_config_file, info_dict=None,
with open(img.name, 'ab') as f:
f.write(boot_signature_bytes)
# Sign the image if vboot is non-empty.
if info_dict.get("vboot"):
path = "/" + partition_name
@@ -1863,7 +1862,8 @@ def _BuildVendorBootImage(sourcedir, partition_name, info_dict=None):
fn = os.path.join(sourcedir, "dtb")
if os.access(fn, os.F_OK):
has_vendor_kernel_boot = (info_dict.get("vendor_kernel_boot", "").lower() == "true")
has_vendor_kernel_boot = (info_dict.get(
"vendor_kernel_boot", "").lower() == "true")
# Pack dtb into vendor_kernel_boot if building vendor_kernel_boot.
# Otherwise pack dtb into vendor_boot.
@@ -1974,7 +1974,7 @@ def GetVendorBootImage(name, prebuilt_name, unpack_dir, tree_subdir,
def GetVendorKernelBootImage(name, prebuilt_name, unpack_dir, tree_subdir,
info_dict=None):
info_dict=None):
"""Return a File object with the desired vendor kernel boot image.
Look for it under 'unpack_dir'/IMAGES, otherwise construct it from
@@ -2358,7 +2358,8 @@ def SignFile(input_name, output_name, key, password, min_api_level=None,
if proc.returncode != 0:
raise ExternalError(
"Failed to run {}: return code {}:\n{}".format(cmd,
proc.returncode, stdoutdata))
proc.returncode, stdoutdata))
def SignSePolicy(sepolicy, key, password):
"""Sign the sepolicy zip, producing an fsverity .fsv_sig and
@@ -2373,9 +2374,9 @@ def SignSePolicy(sepolicy, key, password):
OPTIONS.search_path, OPTIONS.signapk_shared_library_path)
cmd = ([OPTIONS.java_path] + OPTIONS.java_args +
["-Djava.library.path=" + java_library_path,
["-Djava.library.path=" + java_library_path,
"-jar", os.path.join(OPTIONS.search_path, OPTIONS.sign_sepolicy_path)] +
OPTIONS.extra_sign_sepolicy_args)
OPTIONS.extra_sign_sepolicy_args)
cmd.extend([key + OPTIONS.public_key_suffix,
key + OPTIONS.private_key_suffix,
@@ -2391,6 +2392,7 @@ def SignSePolicy(sepolicy, key, password):
proc.returncode, stdoutdata))
return True
def CheckSize(data, target, info_dict):
"""Checks the data string passed against the max size limit.
@@ -2608,13 +2610,17 @@ def ParseOptions(argv,
elif o in ("--private_key_suffix",):
OPTIONS.private_key_suffix = a
elif o in ("--boot_signer_path",):
raise ValueError("--boot_signer_path is no longer supported, please switch to AVB")
raise ValueError(
"--boot_signer_path is no longer supported, please switch to AVB")
elif o in ("--boot_signer_args",):
raise ValueError("--boot_signer_args is no longer supported, please switch to AVB")
raise ValueError(
"--boot_signer_args is no longer supported, please switch to AVB")
elif o in ("--verity_signer_path",):
raise ValueError("--verity_signer_path is no longer supported, please switch to AVB")
raise ValueError(
"--verity_signer_path is no longer supported, please switch to AVB")
elif o in ("--verity_signer_args",):
raise ValueError("--verity_signer_args is no longer supported, please switch to AVB")
raise ValueError(
"--verity_signer_args is no longer supported, please switch to AVB")
elif o in ("-s", "--device_specific"):
OPTIONS.device_specific = a
elif o in ("-x", "--extra"):
@@ -3972,132 +3978,6 @@ def GetBootImageTimestamp(boot_img):
return None
def GetCareMap(which, imgname):
"""Returns the care_map string for the given partition.
Args:
which: The partition name, must be listed in PARTITIONS_WITH_CARE_MAP.
imgname: The filename of the image.
Returns:
(which, care_map_ranges): care_map_ranges is the raw string of the care_map
RangeSet; or None.
"""
assert which in PARTITIONS_WITH_CARE_MAP
# which + "_image_size" contains the size that the actual filesystem image
# resides in, which is all that needs to be verified. The additional blocks in
# the image file contain verity metadata, by reading which would trigger
# invalid reads.
image_size = OPTIONS.info_dict.get(which + "_image_size")
if not image_size:
return None
disable_sparse = OPTIONS.info_dict.get(which + "_disable_sparse")
image_blocks = int(image_size) // 4096 - 1
# It's OK for image_blocks to be 0, because care map ranges are inclusive.
# So 0-0 means "just block 0", which is valid.
assert image_blocks >= 0, "blocks for {} must be non-negative, image size: {}".format(
which, image_size)
# For sparse images, we will only check the blocks that are listed in the care
# map, i.e. the ones with meaningful data.
if "extfs_sparse_flag" in OPTIONS.info_dict and not disable_sparse:
simg = sparse_img.SparseImage(imgname)
care_map_ranges = simg.care_map.intersect(
rangelib.RangeSet("0-{}".format(image_blocks)))
# Otherwise for non-sparse images, we read all the blocks in the filesystem
# image.
else:
care_map_ranges = rangelib.RangeSet("0-{}".format(image_blocks))
return [which, care_map_ranges.to_string_raw()]
def AddCareMapForAbOta(output_file, ab_partitions, image_paths):
"""Generates and adds care_map.pb for a/b partition that has care_map.
Args:
output_file: The output zip file (needs to be already open),
or file path to write care_map.pb.
ab_partitions: The list of A/B partitions.
image_paths: A map from the partition name to the image path.
"""
if not output_file:
raise ExternalError('Expected output_file for AddCareMapForAbOta')
care_map_list = []
for partition in ab_partitions:
partition = partition.strip()
if partition not in PARTITIONS_WITH_CARE_MAP:
continue
verity_block_device = "{}_verity_block_device".format(partition)
avb_hashtree_enable = "avb_{}_hashtree_enable".format(partition)
if (verity_block_device in OPTIONS.info_dict or
OPTIONS.info_dict.get(avb_hashtree_enable) == "true"):
if partition not in image_paths:
logger.warning('Potential partition with care_map missing from images: %s',
partition)
continue
image_path = image_paths[partition]
if not os.path.exists(image_path):
raise ExternalError('Expected image at path {}'.format(image_path))
care_map = GetCareMap(partition, image_path)
if not care_map:
continue
care_map_list += care_map
# adds fingerprint field to the care_map
# TODO(xunchang) revisit the fingerprint calculation for care_map.
partition_props = OPTIONS.info_dict.get(partition + ".build.prop")
prop_name_list = ["ro.{}.build.fingerprint".format(partition),
"ro.{}.build.thumbprint".format(partition)]
present_props = [x for x in prop_name_list if
partition_props and partition_props.GetProp(x)]
if not present_props:
logger.warning(
"fingerprint is not present for partition %s", partition)
property_id, fingerprint = "unknown", "unknown"
else:
property_id = present_props[0]
fingerprint = partition_props.GetProp(property_id)
care_map_list += [property_id, fingerprint]
if not care_map_list:
return
# Converts the list into proto buf message by calling care_map_generator; and
# writes the result to a temp file.
temp_care_map_text = MakeTempFile(prefix="caremap_text-",
suffix=".txt")
with open(temp_care_map_text, 'w') as text_file:
text_file.write('\n'.join(care_map_list))
temp_care_map = MakeTempFile(prefix="caremap-", suffix=".pb")
care_map_gen_cmd = ["care_map_generator", temp_care_map_text, temp_care_map]
RunAndCheckOutput(care_map_gen_cmd)
if not isinstance(output_file, zipfile.ZipFile):
shutil.copy(temp_care_map, output_file)
return
# output_file is a zip file
care_map_path = "META/care_map.pb"
if care_map_path in output_file.namelist():
# Copy the temp file into the OPTIONS.input_tmp dir and update the
# replace_updated_files_list used by add_img_to_target_files
if not OPTIONS.replace_updated_files_list:
OPTIONS.replace_updated_files_list = []
shutil.copy(temp_care_map, os.path.join(OPTIONS.input_tmp, care_map_path))
OPTIONS.replace_updated_files_list.append(care_map_path)
else:
ZipWrite(output_file, temp_care_map, arcname=care_map_path)
def IsSparseImage(filepath):
with open(filepath, 'rb') as fp:
# Magic for android sparse image format