Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77bd852f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ibfe4ca77324e5240340ccb17e0877f792c85d4e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 911a63c0 d9e0788e

tools/releasetools/common.py

+5 −1
Original line number Diff line number Diff line
@@ -1192,6 +1192,10 @@ def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict): 
    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", ""),