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
This commit is contained in:
@@ -15,11 +15,18 @@
|
||||
# limitations under the License.
|
||||
|
||||
"""
|
||||
Given a target-files zipfile, produces an image zipfile suitable for
|
||||
use with 'fastboot update'.
|
||||
Given target-files, produces an image zipfile suitable for use
|
||||
with 'fastboot update'.
|
||||
|
||||
Usage: img_from_target_files [flags] input_target_files output_image_zip
|
||||
|
||||
input_target_files: one of the following:
|
||||
- directory containing extracted target files. It will load info from
|
||||
OTA/android-info.txt and build the image zipfile using images from IMAGES/.
|
||||
- target files package. Same as above, but extracts the archive before
|
||||
building the image zipfile.
|
||||
|
||||
Flags:
|
||||
-z (--bootable_zip)
|
||||
Include only the bootable images (eg 'boot' and 'recovery') in
|
||||
the output.
|
||||
@@ -76,7 +83,16 @@ def main(argv):
|
||||
|
||||
common.InitLogging()
|
||||
|
||||
OPTIONS.input_tmp = common.UnzipTemp(args[0], ["IMAGES/*", "OTA/*"])
|
||||
target_files = args[0]
|
||||
if os.path.isdir(target_files):
|
||||
logger.info("Building image zip from extracted target files.")
|
||||
OPTIONS.input_tmp = target_files
|
||||
elif zipfile.is_zipfile(target_files):
|
||||
logger.info("Building image zip from target files zip.")
|
||||
OPTIONS.input_tmp = common.UnzipTemp(args[0], ["IMAGES/*", "OTA/*"])
|
||||
else:
|
||||
raise ValueError("%s is not a valid path." % target_files)
|
||||
|
||||
output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED)
|
||||
CopyInfo(output_zip)
|
||||
|
||||
|
Reference in New Issue
Block a user