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

Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773

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

Change-Id: I093dccc54174e68f282d9a0f79e6a5ba7f2555ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-08 23:08:30 +00:00
committed by Automerger Merge Worker
parent 9fa9bee104 d60dbf9773
commit 980458ae17
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

@@ -1063,6 +1063,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# ZIP_STORED. # ZIP_STORED.
common.ZipWriteStr(output_zip, care_map_name, care_map_data, common.ZipWriteStr(output_zip, care_map_name, care_map_data,
compress_type=zipfile.ZIP_STORED) compress_type=zipfile.ZIP_STORED)
# break here to avoid going into else when care map has been handled
break
else: else:
logger.warning("Cannot find care map file in target_file package") logger.warning("Cannot find care map file in target_file package")