Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74eb74b1 authored by Daniel Norman's avatar Daniel Norman
Browse files

Creates img.zip from target files zip, not dir. 

Directory support for img_from_target_files was dropped in aosp/1095755.

Test: Create & boot a merged build.
Change-Id: Ib976ea60a24c2f172c597130d6bcce25199a93b3
parent 0b67e41f

tools/releasetools/merge_target_files.py

+5 −5
Original line number Diff line number Diff line
@@ -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)



  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

  # 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,

                                           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.



  if output_ota: