Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67bcf129 authored by Steven Laver's avatar Steven Laver Committed by android-build-merger
Browse files

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

Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472f am: 338f16c2
am: 01568644

Change-Id: I7edca53a72db574ad03f14f5d9c32ea64ae6b48c
parents 1023921d 01568644

tools/releasetools/merge_target_files.py

+3 −3
Original line number Diff line number Diff line
@@ -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(