Merge "Skip generating care_map for non-AB updates" am: e3935dd7f0

Original change: https://android-review.googlesource.com/c/platform/build/+/1963386

Change-Id: I745746f2ae49fdfea554dc3ccd1f33caa60ac5b4
This commit is contained in:
Treehugger Robot
2022-01-27 22:37:18 +00:00
committed by Automerger Merge Worker

View File

@@ -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,