p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

releasetools: Remove the mismatch map files when generating retrofit OTAs. 

The map files contain the filename-block mapping for the original
images.

Bug: 120109184
Test: Generate an incremental OTA that was previously failing.
Change-Id: I1285d0b24a435477b958e6c2e4f474acf8f7578b
This commit is contained in:
Tao Bao 2018-11-28 10:59:23 -08:00
parent 638ca85aec
commit 03fecb669c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/ota_from_target_files.py
View File

@ -1745,7 +1745,7 @@ def GetTargetFilesZipForRetrofitDynamicPartitions(input_file,
assert super_block_devices, "No super_block_devices are specified."
replace = {'OTA/super_{}.img'.format(dev): 'IMAGES/{}.img'.format(dev)
for dev in super_block_devices}
for dev in super_block_devices}
target_file = common.MakeTempFile(prefix="targetfiles-", suffix=".zip")
shutil.copyfile(input_file, target_file)
@ -1760,8 +1760,9 @@ def GetTargetFilesZipForRetrofitDynamicPartitions(input_file,
# is a regular update on devices without dynamic partitions support.
to_delete += [DYNAMIC_PARTITION_INFO]
# Remove the existing partition images.
# Remove the existing partition images as well as the map files.
to_delete += replace.values()
to_delete += ['IMAGES/{}.map'.format(dev) for dev in super_block_devices]
common.ZipDelete(target_file, to_delete)