commit b837b7170b9711df77886f417cc36c6526253e54
author Iavor-Valentin Iftime <valiiftime@google.com> Thu Jan 27 16:29:37 2022 +0000
committer Robin Lee <rgl@google.com> Thu Jan 27 18:35:43 2022 +0000
tree c8e723fc68d97b383a483be7c1cb3a2b8d5870f1
parent ee5ceff61e4a7fdcbfdb1c9739b31e8d5a07155c

Skip generating care_map for non-AB updates

Bug: 186097910
Test: build a non-AB update merged target using Forrest,
      No errors reported and no META/care_map.pb is generated.

Change-Id: I74990b0aa7f46d4c4d40098a4b102f7e04166c39

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 46ffdb7..6b3b01f 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -1618,8 +1618,9 @@
   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,