StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I97cdfad6dcd928569ead0f0d21dd02b66068b3fe
This commit is contained in:
Treehugger Robot
2022-01-27 23:03:15 +00:00
committed by Automerger Merge Worker
parent cf155caf5b f0dbde9990
commit bbedf706bc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/merge_target_files.py
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,