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

Merge "Temporarily remove the care_map in the ota package" am: 3fcc52519e am: c8e5f1de93 am: 4cd4b0c572

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

Change-Id: I98c0e9f058543c6c27153740459cff59700e59fe
This commit is contained in:
Tianjie Xu
2021-11-09 20:50:19 +00:00
committed by Automerger Merge Worker
parent 6df2faf751 4cd4b0c572
commit 16b4beb644
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/ota_from_target_files.py
View File

@@ -1191,6 +1191,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if
"META/" + x in target_zip.namelist()] "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. # Adds care_map if either the protobuf format or the plain text one exists.
if care_map_list: if care_map_list:
care_map_name = care_map_list[0] care_map_name = care_map_list[0]