openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fix an issue in common.GetSparseImage" am: 90c1763c0c 

Original change: https://android-review.googlesource.com/c/platform/build/+/1602475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302dd296101733c794a8a11c6ce6713beb170678
This commit is contained in:
Treehugger Robot 2021-02-25 05:32:34 +00:00 committed by Automerger Merge Worker
parent 3cc2b4c489 90c1763c0c
commit b002cc3fbe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@ -1939,12 +1939,13 @@ def GetSparseImage(which, tmpdir, input_zip, allow_shared_blocks,
# filename listed in system.map may contain an additional leading slash
# (i.e. "//system/framework/am.jar"). Using lstrip to get consistent
# results.
arcname = entry.replace(which, which.upper(), 1).lstrip('/')
# Special handling another case, where files not under /system
# And handle another special case, where files not under /system
# (e.g. "/sbin/charger") are packed under ROOT/ in a target_files.zip.
if which == 'system' and not arcname.startswith('SYSTEM'):
arcname = entry.lstrip('/')
if which == 'system' and not arcname.startswith('system'):
arcname = 'ROOT/' + arcname
else:
arcname = arcname.replace(which, which.upper(), 1)
assert arcname in input_zip.namelist(), \
"Failed to find the ZIP entry for {}".format(entry)