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

Merge "Sort content of merged target files package." am: d540f5a9a5

Browse Source 
am: d40f5b6ec0

Change-Id: I80bfda5dd7367e964629c7a4201a5c772ececa90
This commit is contained in:
Bill Peckham
2019-04-25 09:38:09 -07:00
committed by android-build-merger
parent 1eef250cd7 d40f5b6ec0
commit 912d2dff70
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/releasetools/merge_target_files.py
View File

@@ -722,18 +722,21 @@ def merge_target_files(temp_dir, system_target_files, system_item_list,
output_target_files_meta_dir = os.path.join(output_target_files_temp_dir,
'META')
command = [
find_command = [
'find',
output_target_files_meta_dir,
]
# TODO(bpeckham): sort this to be more like build.
meta_content = common.RunAndCheckOutput(command, verbose=False)
command = [
find_process = common.Run(find_command, stdout=subprocess.PIPE, verbose=False)
meta_content = common.RunAndCheckOutput(['sort'], stdin=find_process.stdout,
verbose=False)
find_command = [
'find', output_target_files_temp_dir, '-path',
output_target_files_meta_dir, '-prune', '-o', '-print'
]
# TODO(bpeckham): sort this to be more like build.
other_content = common.RunAndCheckOutput(command, verbose=False)
find_process = common.Run(find_command, stdout=subprocess.PIPE, verbose=False)
other_content = common.RunAndCheckOutput(['sort'], stdin=find_process.stdout,
verbose=False)
with open(output_target_files_list, 'wb') as f:
f.write(meta_content)