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

Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts.

Browse Source 
All callers of this function now always pass the same values, so this
change hardcodes those values within the function body.

Fix: 145008064
Test: python -m unittest test_common
Test: build & boot a merged target that uses DAP

Change-Id: I0051c5ba507983231825edfcaf349e574efa451a
This commit is contained in:
Daniel Norman
2019-11-25 16:04:36 -08:00
parent fcd0862632
commit 55417148f9
4 changed files with 32 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tools/releasetools/common.py
View File

@@ -779,13 +779,7 @@ def DumpInfoDict(d):
logger.info("%-25s = (%s) %s", k, type(v).__name__, v)
def MergeDynamicPartitionInfoDicts(framework_dict,
vendor_dict,
include_dynamic_partition_list=True,
size_prefix="",
size_suffix="",
list_prefix="",
list_suffix=""):
def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict):
"""Merges dynamic partition info variables.
Args:
@@ -793,18 +787,6 @@ def MergeDynamicPartitionInfoDicts(framework_dict,
partial framework target files.
vendor_dict: The dictionary of dynamic partition info variables from the
partial vendor target files.
include_dynamic_partition_list: If true, merges the dynamic_partition_list
variable. Not all use cases need this variable merged.
size_prefix: The prefix in partition group size variables that precedes the
name of the partition group. For example, partition group 'group_a' with
corresponding size variable 'super_group_a_group_size' would have the
size_prefix 'super_'.
size_suffix: Similar to size_prefix but for the variable's suffix. For
example, 'super_group_a_group_size' would have size_suffix '_group_size'.
list_prefix: Similar to size_prefix but for the partition group's
partition_list variable.
list_suffix: Similar to size_suffix but for the partition group's
partition_list variable.
Returns:
The merged dynamic partition info dictionary.
@@ -813,24 +795,21 @@ def MergeDynamicPartitionInfoDicts(framework_dict,
# Partition groups and group sizes are defined by the vendor dict because
# these values may vary for each board that uses a shared system image.
merged_dict["super_partition_groups"] = vendor_dict["super_partition_groups"]
if include_dynamic_partition_list:
framework_dynamic_partition_list = framework_dict.get(
"dynamic_partition_list", "")
vendor_dynamic_partition_list = vendor_dict.get("dynamic_partition_list",
"")
merged_dict["dynamic_partition_list"] = (
"%s %s" % (framework_dynamic_partition_list,
vendor_dynamic_partition_list)).strip()
framework_dynamic_partition_list = framework_dict.get(
"dynamic_partition_list", "")
vendor_dynamic_partition_list = vendor_dict.get("dynamic_partition_list", "")
merged_dict["dynamic_partition_list"] = ("%s %s" % (
framework_dynamic_partition_list, vendor_dynamic_partition_list)).strip()
for partition_group in merged_dict["super_partition_groups"].split(" "):
# Set the partition group's size using the value from the vendor dict.
key = "%s%s%s" % (size_prefix, partition_group, size_suffix)
key = "super_%s_group_size" % partition_group
if key not in vendor_dict:
raise ValueError("Vendor dict does not contain required key %s." % key)
merged_dict[key] = vendor_dict[key]
# Set the partition group's partition list using a concatenation of the
# framework and vendor partition lists.
key = "%s%s%s" % (list_prefix, partition_group, list_suffix)
key = "super_%s_partition_list" % partition_group
merged_dict[key] = (
"%s %s" %
(framework_dict.get(key, ""), vendor_dict.get(key, ""))).strip()