commit d9e0788ee7668a4d1dd443b33cf7aa3baeb8bc9f
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 03 02:37:34 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 03 02:37:34 2022 +0000
tree 117c62e9e4b9b7d0ac003b7c3a5516e506eb8340
parent 7a79a273566505e02c1ccc23a311d2d20ff45fd6
parent 6a683ce02b42bbb5c9b1e248f2b663e0855ace5c

Merge "Merge identical key/val pairs in dynamic partition info"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 5f74e2b..4010f35 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1188,10 +1188,14 @@
     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", ""),