Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt"

am: 1567472ff9

Change-Id: I516ca816ae086aa1a17e58a7bf1524f922700cd0
This commit is contained in:
Steven Laver 2019-11-23 07:24:49 -08:00 committed by android-build-merger
commit 338f16c2df

View file

@ -481,9 +481,9 @@ def process_dynamic_partitions_info_txt(framework_target_files_dir,
merged_dynamic_partitions_dict = common.MergeDynamicPartitionInfoDicts( merged_dynamic_partitions_dict = common.MergeDynamicPartitionInfoDicts(
framework_dict=framework_dynamic_partitions_dict, framework_dict=framework_dynamic_partitions_dict,
vendor_dict=vendor_dynamic_partitions_dict, vendor_dict=vendor_dynamic_partitions_dict,
# META/dynamic_partitions_info.txt does not use dynamic_partition_list. size_prefix='super_',
include_dynamic_partition_list=False, size_suffix='_group_size',
size_suffix='_size', list_prefix='super_',
list_suffix='_partition_list') list_suffix='_partition_list')
output_dynamic_partitions_info_txt = os.path.join( output_dynamic_partitions_info_txt = os.path.join(