commit 55417148f9b598626d0db1de1c813101339ee854
author Daniel Norman <danielnorman@google.com> Mon Nov 25 16:04:36 2019 -0800
committer Daniel Norman <danielnorman@google.com> Tue Nov 26 11:09:17 2019 -0800
tree 581fd59ad431d6602aa2c7acae1bc2deb44f82c9
parent fcd0862632e4becd499f0b0877a18aa03b92e5ec

Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts.

All callers of this function now always pass the same values, so this
change hardcodes those values within the function body.

Fix: 145008064
Test: python -m unittest test_common
Test: build & boot a merged target that uses DAP

Change-Id: I0051c5ba507983231825edfcaf349e574efa451a

tools/releasetools/merge_builds.py

diff --git a/tools/releasetools/merge_builds.py b/tools/releasetools/merge_builds.py
index ca348cf..3ac4ec4 100644
--- a/tools/releasetools/merge_builds.py
+++ b/tools/releasetools/merge_builds.py
@@ -96,12 +96,7 @@
     merged_dict = dict(vendor_dict)
     merged_dict.update(
         common.MergeDynamicPartitionInfoDicts(
-            framework_dict=framework_dict,
-            vendor_dict=vendor_dict,
-            size_prefix="super_",
-            size_suffix="_group_size",
-            list_prefix="super_",
-            list_suffix="_partition_list"))
+            framework_dict=framework_dict, vendor_dict=vendor_dict))
     output_super_empty_path = os.path.join(OPTIONS.product_out_vendor,
                                            "super_empty.img")
     build_super_image.BuildSuperImage(merged_dict, output_super_empty_path)