tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 9d4a90ef4b

Change-Id: I93659811499f3f2b8a3d2e88be08b9c9ec48aecf
This commit is contained in:
P Adarsh Reddy 2020-01-02 13:38:22 -08:00 committed by android-build-merger
commit d5e0c4761f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/releasetools/common.py
View file

@ -823,6 +823,12 @@ def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict):
merged_dict[key] = ( merged_dict[key] = (
"%s %s" % "%s %s" %
(framework_dict.get(key, ""), vendor_dict.get(key, ""))).strip() (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 return merged_dict