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

Infer prebuilt image size

Browse Source 
Test: call script twice; the second time uses prebuilts
Fixes: 119769527

Change-Id: Icd98a4dbfed91538cbc07aab957c7b042c05b330
This commit is contained in:
Yifan Hong
2018-11-21 17:48:10 -08:00
parent 9b024fe583
commit 70fc029ab8
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/releasetools/add_img_to_target_files.py
View File

@@ -677,17 +677,25 @@ def AddSuperEmpty(output_zip):
def AddSuperSplit(output_zip): def AddSuperSplit(output_zip):
"""Create split super_*.img and store it in output_zip.""" """Create split super_*.img and store it in output_zip."""
def GetPartitionSizeFromImage(img):
try:
simg = sparse_img.SparseImage(img)
return simg.blocksize * simg.total_blocks
except ValueError:
return os.path.getsize(img)
def TransformPartitionArg(arg): def TransformPartitionArg(arg):
lst = arg.split(':') lst = arg.split(':')
# Because --auto-slot-suffixing for A/B, there is no need to remove suffix. # Because --auto-slot-suffixing for A/B, there is no need to remove suffix.
name = lst[0] name = lst[0]
assert name + '_size' in OPTIONS.info_dict, ( if name + '_size' in OPTIONS.info_dict:
"{} is a prebuilt. Dynamic partitions with prebuilt images " size = str(OPTIONS.info_dict[name + '_size'])
"are not supported yet.".format(name)) logger.info("Using %s_size = %s", name, size)
size = OPTIONS.info_dict[name + '_size'] else:
assert size is not None, \ size = str(GetPartitionSizeFromImage(
'{0}_size is not found; is {0} built?'.format(name) os.path.join(OPTIONS.input_tmp, "IMAGES", '{}.img'.format(name))))
lst[2] = str(size) logger.info("Using size of prebuilt %s = %s", name, size)
lst[2] = size
return ':'.join(lst) return ':'.join(lst)
def GetLpmakeArgsWithSizes(): def GetLpmakeArgsWithSizes():