Adds support to create img from target files directory instead of zip.
This is used by merge_target_files to prevent an unnecessary unzip and
copy.
Test: Ran merge_target_files.py and booted using the img.zip.
Change-Id: I6fe0dd025b30b3f4965c9b22fb6943019bf5899b
diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 2e5cbca..0902d90 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -698,6 +698,16 @@
if output_super_empty:
shutil.copyfile(super_empty_img, output_super_empty)
+ # Create the IMG package from the merged target files (before zipping, in
+ # order to avoid an unnecessary unzip and copy).
+
+ if output_img:
+ img_from_target_files_args = [
+ output_target_files_temp_dir,
+ output_img,
+ ]
+ img_from_target_files.main(img_from_target_files_args)
+
# Finally, create the output target files zip archive and/or copy the
# output items to the output target files directory.
@@ -751,14 +761,6 @@
]
ota_from_target_files.main(ota_from_target_files_args)
- # Create the IMG package from the merged target files package.
-
- if output_img:
- img_from_target_files_args = [
- output_zip,
- output_img,
- ]
- img_from_target_files.main(img_from_target_files_args)
def call_func_with_temp_dir(func, keep_tmp):