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

Merge "Merge identical key/val pairs in dynamic partition info" am: d9e0788ee7

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

Change-Id: Ibfe4ca77324e5240340ccb17e0877f792c85d4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-05-03 05:05:07 +00:00
committed by Automerger Merge Worker
parent 911a63c0ff d9e0788ee7
commit 77bd852ff0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/common.py
View File

@@ -1188,10 +1188,14 @@ 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"}
# For keys-value pairs that are the same, copy to merged dict
for key in vendor_dict.keys():
if key in framework_dict and framework_dict[key] == vendor_dict[key]:
merged_dict[key] = vendor_dict[key]
merged_dict["dynamic_partition_list"] = uniq_concat(
framework_dict.get("dynamic_partition_list", ""),