StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Temporarily remove the care_map in the ota package"" am: fab626b7d0 am: 1cdcb088bb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1907490

Change-Id: I8fcb0a0dac7c89e37bf08f96e8778e5aba68da7a
This commit is contained in:
Tianjie Xu
2021-12-01 18:49:53 +00:00
committed by Automerger Merge Worker
parent bfa878e9de 1cdcb088bb
commit a8c667a4b7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/ota_from_target_files.py
View File

@@ -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]