From 615385ee8b9c770bd18b47215bdb89187ca7e6c5 Mon Sep 17 00:00:00 2001 From: Steven Laver Date: Fri, 22 Nov 2019 09:34:27 -0800 Subject: [PATCH] releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt With a recent change (cb8e2755ff610bc856fecf5518e63767abe626bf) to the generation of dynamic_partitions_info.txt, process_dynamic_partitions_info_txt() needs a corresponding update. Change-Id: I30ec92176fd9cd737160b579214eb5b3d6a44c10 --- tools/releasetools/merge_target_files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index 544f996f99..e588fb5b5f 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -481,9 +481,9 @@ def process_dynamic_partitions_info_txt(framework_target_files_dir, merged_dynamic_partitions_dict = common.MergeDynamicPartitionInfoDicts( framework_dict=framework_dynamic_partitions_dict, vendor_dict=vendor_dynamic_partitions_dict, - # META/dynamic_partitions_info.txt does not use dynamic_partition_list. - include_dynamic_partition_list=False, - size_suffix='_size', + size_prefix='super_', + size_suffix='_group_size', + list_prefix='super_', list_suffix='_partition_list') output_dynamic_partitions_info_txt = os.path.join(