From a84d13bc6e36fd2f103659eff67df9315af3d941 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 17 Feb 2022 14:16:40 -0800 Subject: [PATCH] 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 --- tools/releasetools/merge_target_files.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index 5c273c298d..f72412df47 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -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,