Loading tools/releasetools/common.py +5 −1 Original line number Diff line number Diff line Loading @@ -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", ""), Loading Loading
tools/releasetools/common.py +5 −1 Original line number Diff line number Diff line Loading @@ -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", ""), Loading