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

Commit d5e0c476 authored by P Adarsh Reddy's avatar P Adarsh Reddy Committed by android-build-merger
Browse files

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

am: 9d4a90ef

Change-Id: I93659811499f3f2b8a3d2e88be08b9c9ec48aecf
parents 04b25efc 9d4a90ef

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