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

Merge "Allow missing key for misc_info lookups."

Browse Source
This commit is contained in:
Treehugger Robot
2022-03-03 23:46:15 +00:00
committed by Gerrit Code Review
parent 0b6921be2b c44f964a5a
commit 54188ba009
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/merge_target_files.py
View File

@@ -726,13 +726,13 @@ def merge_meta_files(temp_dir, merged_dir):
vendor_meta_dir=vendor_meta_dir, vendor_meta_dir=vendor_meta_dir,
merged_meta_dir=merged_meta_dir) merged_meta_dir=merged_meta_dir)
if OPTIONS.merged_misc_info['use_dynamic_partitions'] == 'true': if OPTIONS.merged_misc_info.get('use_dynamic_partitions') == 'true':
merge_dynamic_partitions_info_txt( merge_dynamic_partitions_info_txt(
framework_meta_dir=framework_meta_dir, framework_meta_dir=framework_meta_dir,
vendor_meta_dir=vendor_meta_dir, vendor_meta_dir=vendor_meta_dir,
merged_meta_dir=merged_meta_dir) merged_meta_dir=merged_meta_dir)
if OPTIONS.merged_misc_info['ab_update'] == 'true': if OPTIONS.merged_misc_info.get('ab_update') == 'true':
merge_ab_partitions_txt( merge_ab_partitions_txt(
framework_meta_dir=framework_meta_dir, framework_meta_dir=framework_meta_dir,
vendor_meta_dir=vendor_meta_dir, vendor_meta_dir=vendor_meta_dir,
@@ -1363,7 +1363,7 @@ def merge_target_files(temp_dir):
return return
# Create the merged META/care_map.pb if the device uses A/B updates. # Create the merged META/care_map.pb if the device uses A/B updates.
if OPTIONS.merged_misc_info['ab_update'] == 'true': if OPTIONS.merged_misc_info.get('ab_update') == 'true':
generate_care_map(partition_map.keys(), output_target_files_temp_dir) generate_care_map(partition_map.keys(), output_target_files_temp_dir)
create_target_files_archive(OPTIONS.output_target_files, create_target_files_archive(OPTIONS.output_target_files,