commit c44f964a5ad01d98b50121111998af482b61d79a
author Daniel Norman <danielnorman@google.com> Thu Mar 03 19:41:13 2022 +0000
committer Daniel Norman <danielnorman@google.com> Thu Mar 03 19:42:32 2022 +0000
tree c73087ff224d47b49d7879c67c14f2c7ad72bf58
parent 0b6921be2bdd783adb564b09632b8fd11cff7161

Allow missing key for misc_info lookups.

This broke the TV-VF build in ab/8246202.

Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index c0c94bf..6d3ee3f 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -726,13 +726,13 @@
       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 @@
     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,