diff options
| author | 2022-03-03 19:41:13 +0000 | |
|---|---|---|
| committer | 2022-03-03 19:42:32 +0000 | |
| commit | c44f964a5ad01d98b50121111998af482b61d79a (patch) | |
| tree | c73087ff224d47b49d7879c67c14f2c7ad72bf58 | |
| parent | 0b6921be2bdd783adb564b09632b8fd11cff7161 (diff) | |
Allow missing key for misc_info lookups.
This broke the TV-VF build in ab/8246202.
Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d
| -rwxr-xr-x | tools/releasetools/merge_target_files.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index c0c94bfbff..6d3ee3f658 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -726,13 +726,13 @@ def merge_meta_files(temp_dir, merged_dir): vendor_meta_dir=vendor_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( framework_meta_dir=framework_meta_dir, vendor_meta_dir=vendor_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( framework_meta_dir=framework_meta_dir, vendor_meta_dir=vendor_meta_dir, @@ -1363,7 +1363,7 @@ def merge_target_files(temp_dir): return # 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) create_target_files_archive(OPTIONS.output_target_files, |