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

Merge "Sort the split transfers to generate a determinate package"

Browse source
This commit is contained in:
Tianjie Xu 2018-01-11 04:15:28 +00:00 committed by Gerrit Code Review
commit c56071b21b
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/releasetools/blockimgdiff.py
View file

@ -1385,8 +1385,8 @@ class BlockImageDiff(object):
assert patch_start == patch_size
return split_info_list
def AddSplitTransferForLargeApks():
"""Create split transfers for large apk files.
def SplitLargeApks():
"""Split the large apks files.
Example: Chrome.apk will be split into
src-0: Chrome.apk-0, tgt-0: Chrome.apk-0
@ -1452,16 +1452,16 @@ class BlockImageDiff(object):
split_src_name = "{}-{}".format(src_name, index)
split_tgt_name = "{}-{}".format(tgt_name, index)
transfer_split = Transfer(split_tgt_name, split_src_name,
split_tgt_ranges, split_src_ranges,
self.tgt.RangeSha1(split_tgt_ranges),
self.src.RangeSha1(split_src_ranges),
"diff", self.transfers)
transfer_split.patch = patch_content
split_large_apks.append((split_tgt_name,
split_src_name,
split_tgt_ranges,
split_src_ranges,
patch_content))
print("Finding transfers...")
large_apks = []
split_large_apks = []
cache_size = common.OPTIONS.cache_size
split_threshold = 0.125
max_blocks_per_transfer = int(cache_size * split_threshold /
@ -1511,13 +1511,23 @@ class BlockImageDiff(object):
AddTransfer(tgt_fn, None, tgt_ranges, empty, "new", self.transfers)
transfer_lock = threading.Lock()
threads = [threading.Thread(target=AddSplitTransferForLargeApks)
threads = [threading.Thread(target=SplitLargeApks)
for _ in range(self.threads)]
for th in threads:
th.start()
while threads:
threads.pop().join()
# Sort the split transfers for large apks to generate a determinate package.
split_large_apks.sort()
for (tgt_name, src_name, tgt_ranges, src_ranges,
patch) in split_large_apks:
transfer_split = Transfer(tgt_name, src_name, tgt_ranges, src_ranges,
self.tgt.RangeSha1(tgt_ranges),
self.src.RangeSha1(src_ranges),
"diff", self.transfers)
transfer_split.patch = patch
def AbbreviateSourceNames(self):
for k in self.src.file_map.keys():
b = os.path.basename(k)