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

Merge "Creates img.zip from target files zip, not dir." am: c4f6f36dc4 am: 28dfca32ca am: 50ecbd5b8e 

am: 9f2d12ac6e

Change-Id: Idf2a628b067a51241770d0ce6d1b1d9d598d3666
This commit is contained in:
Daniel Norman 2019-09-18 18:51:36 -07:00 committed by android-build-merger
parent 2504faee09 9f2d12ac6e
commit 7c7e3e69bd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/merge_target_files.py
View File

@ -914,11 +914,6 @@ def merge_target_files(temp_dir, framework_target_files, framework_item_list,
generate_super_empty_image(output_target_files_temp_dir, output_super_empty) generate_super_empty_image(output_target_files_temp_dir, output_super_empty)
if output_img:
# Create the IMG package from the merged target files (before zipping, in
# order to avoid an unnecessary unzip and copy).
img_from_target_files.main([output_target_files_temp_dir, output_img])
# Finally, create the output target files zip archive and/or copy the # Finally, create the output target files zip archive and/or copy the
# output items to the output target files directory. # output items to the output target files directory.
@ -932,6 +927,11 @@ def merge_target_files(temp_dir, framework_target_files, framework_item_list,
output_target_files_temp_dir, output_target_files_temp_dir,
temp_dir) temp_dir)
# Create the IMG package from the merged target files package.
if output_img:
img_from_target_files.main([output_zip, output_img])
# Create the OTA package from the merged target files package. # Create the OTA package from the merged target files package.
if output_ota: if output_ota: