From 2f76f90616e81f241c03ac8da098376a5a482a9b Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Wed, 1 Dec 2021 05:54:27 +0000 Subject: [PATCH] Revert "Temporarily remove the care_map in the ota package" This reverts commit 5856cfbf8212ddf9508bc03f58d61ed08a729cf8. Reason for revert: re-enable care_map b/205541521 Change-Id: I64b4637991a80c9d08a28bdd324c47b4067b1762 --- tools/releasetools/ota_from_target_files.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 6d1592c82a..ec703ab7d6 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1191,8 +1191,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if "META/" + x in target_zip.namelist()] - # TODO(b/205541521) remove the workaround after root cause is fixed. - care_map_list = [] # Adds care_map if either the protobuf format or the plain text one exists. if care_map_list: care_map_name = care_map_list[0]