diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-23 15:18:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-23 15:18:33 +0000 |
| commit | 1567472ff9001d0cbe8a213e78fa3000306ec121 (patch) | |
| tree | 649adc3f85b088612bcfe44e26974afeda6272f8 | |
| parent | f81965bdc8c7d2f4fce350e59d392202b62ef573 (diff) | |
| parent | 615385ee8b9c770bd18b47215bdb89187ca7e6c5 (diff) | |
| download | build-1567472ff9001d0cbe8a213e78fa3000306ec121.tar.gz | |
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt"
| -rwxr-xr-x | tools/releasetools/merge_target_files.py | 6 |
1 files 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( |