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

Commit a84d13bc authored by Daniel Norman's avatar Daniel Norman
Browse files

Remove unnecessary AddCareMapForAbOta() in merge_target_files. 

This function is already called by add_img_to_target_files, when needed.

Bug: 187432243
Test: Create a merged build with ab partitions and OTA package
Change-Id: I1d1ec878f4dcf16c8fcbbea10e787a78d1478328
parent e292f5f1

tools/releasetools/merge_target_files.py

+1 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ import ota_from_target_files 
import sparse_img

import verity_utils



from common import AddCareMapForAbOta, ExternalError, PARTITIONS_WITH_CARE_MAP

from common import ExternalError



logger = logging.getLogger(__name__)
@@ -826,10 +826,6 @@ def generate_care_map(partitions, output_target_files_dir): 
        image_size = verity_image_builder.CalculateMaxImageSize(partition_size)

        OPTIONS.info_dict[image_size_prop] = image_size



  AddCareMapForAbOta(

      os.path.join(output_target_files_dir, 'META', 'care_map.pb'),

      PARTITIONS_WITH_CARE_MAP, partition_image_map)





def process_special_cases(temp_dir, framework_meta, vendor_meta,

                          output_target_files_temp_dir,