commit 98050a4e977ed48285a79a279d9626352058ce5a
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 03 08:27:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 03 08:27:35 2022 +0000
tree 92b1a30b2cdeb52cbfae96f35f5fd3add85cd56b
parent d9e0788ee7668a4d1dd443b33cf7aa3baeb8bc9f
parent 6f488e9e339956914d3d7b3295949a0f9e52bfbf

Merge "Expose GetRamdiskFormat and use in ota_utils.py"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index e9dedfd..4db33f1 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -861,6 +861,7 @@
     30.0 \
     31.0 \
     32.0 \
+    33.0 \
 
 .KATI_READONLY := \
     PLATFORM_SEPOLICY_COMPAT_VERSIONS \

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 5261356..374babf 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", ""),