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

Commit ae53351e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Handle virtual A/B defines during dynamic_partitions_info merge." am:... 

Merge "Handle virtual A/B defines during dynamic_partitions_info merge." am: 9d4a90ef am: d5e0c476

Change-Id: I76a7987fda6084273cfc45468249dfd59677b00c
parents f0371207 d5e0c476

tools/releasetools/common.py

+6 −0
Original line number Diff line number Diff line
@@ -823,6 +823,12 @@ def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict): 
    merged_dict[key] = (

        "%s %s" %

        (framework_dict.get(key, ""), vendor_dict.get(key, ""))).strip()



  # Pick virtual ab related flags from vendor dict, if defined.

  if "virtual_ab" in vendor_dict.keys():

     merged_dict["virtual_ab"] = vendor_dict["virtual_ab"]

  if "virtual_ab_retrofit" in vendor_dict.keys():

     merged_dict["virtual_ab_retrofit"] = vendor_dict["virtual_ab_retrofit"]

  return merged_dict