From b837b7170b9711df77886f417cc36c6526253e54 Mon Sep 17 00:00:00 2001 From: Iavor-Valentin Iftime Date: Thu, 27 Jan 2022 16:29:37 +0000 Subject: [PATCH] Skip generating care_map for non-AB updates Bug: 186097910 Test: build a non-AB update merged target using Forrest, No errors reported and no META/care_map.pb is generated. Change-Id: I74990b0aa7f46d4c4d40098a4b102f7e04166c39 --- tools/releasetools/merge_target_files.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index 46ffdb774c..6b3b01fcc2 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -1618,8 +1618,9 @@ def merge_target_files(temp_dir, framework_target_files, framework_item_list, if not output_target_files: return - # Create the merged META/care_map.bp - generate_care_map(partition_map.keys(), output_target_files_temp_dir) + # Create the merged META/care_map.pb if A/B update + if 'ab_update' in framework_misc_info_keys: + generate_care_map(partition_map.keys(), output_target_files_temp_dir) output_zip = create_target_files_archive(output_target_files, output_target_files_temp_dir,