tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773 am: 980458ae17 am: 08fc8461a1 am: ecc527eb52 am: 767c3aa430 am: cf21eb4a93

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

Change-Id: Ie7889f60d670a0b0626447a0f7f160612c23a154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-09 02:47:41 +00:00 committed by Automerger Merge Worker
commit 3827350a58
1 changed files with 2 additions and 0 deletions
Show stats 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.
common.ZipWriteStr(output_zip, care_map_name, care_map_data,
compress_type=zipfile.ZIP_STORED)
# break here to avoid going into else when care map has been handled
break
else:
logger.warning("Cannot find care map file in target_file package")