Merge "Revert "Temporarily remove the care_map in the ota package""

2021-12-01 18:23:41 +00:00
parent 1ecb2f952c 2f76f90616
commit fab626b7d0
1 changed files with 0 additions and 2 deletions
--- 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]