diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/releasetools/common.py | 15 | ||||
| -rwxr-xr-x | tools/releasetools/ota_from_target_files | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 5e4055a..5037ac5 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -196,7 +196,7 @@ def DumpInfoDict(d): for k, v in sorted(d.items()): print "%-25s = (%s) %s" % (k, type(v).__name__, v) -def BuildBootableImage(sourcedir, fs_config_file): +def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): """Take a kernel, cmdline, and ramdisk directory from the input (in 'sourcedir'), and turn them into a boot image. Return the image data, or None if sourcedir does not appear to contains files for @@ -206,6 +206,9 @@ def BuildBootableImage(sourcedir, fs_config_file): not os.access(os.path.join(sourcedir, "kernel"), os.F_OK)): return None + if info_dict is None: + info_dict = OPTIONS.info_dict + ramdisk_img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile() @@ -239,6 +242,10 @@ def BuildBootableImage(sourcedir, fs_config_file): cmd.append("--pagesize") cmd.append(open(fn).read().rstrip("\n")) + args = info_dict.get("mkbootimg_args", None) + if args and args.strip(): + cmd.extend(args.split()) + cmd.extend(["--ramdisk", ramdisk_img.name, "--output", img.name]) @@ -256,7 +263,8 @@ def BuildBootableImage(sourcedir, fs_config_file): return data -def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): +def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, + info_dict=None): """Return a File object (with name 'name') with the desired bootable image. Look for it in 'unpack_dir'/BOOTABLE_IMAGES under the name 'prebuilt_name', otherwise construct it from the source files in @@ -270,7 +278,8 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): print "building image from target_files %s..." % (tree_subdir,) fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt" return File(name, BuildBootableImage(os.path.join(unpack_dir, tree_subdir), - os.path.join(unpack_dir, fs_config))) + os.path.join(unpack_dir, fs_config), + info_dict)) def UnzipTemp(filename, pattern=None): diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 3dcfbee..b8fe68c 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -531,13 +531,15 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.AssertSomeFingerprint(source_fp, target_fp) source_boot = common.GetBootableImage( - "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT") + "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT", + OPTIONS.source_info_dict) target_boot = common.GetBootableImage( "/tmp/boot.img", "boot.img", OPTIONS.target_tmp, "BOOT") updating_boot = (source_boot.data != target_boot.data) source_recovery = common.GetBootableImage( - "/tmp/recovery.img", "recovery.img", OPTIONS.source_tmp, "RECOVERY") + "/tmp/recovery.img", "recovery.img", OPTIONS.source_tmp, "RECOVERY", + OPTIONS.source_info_dict) target_recovery = common.GetBootableImage( "/tmp/recovery.img", "recovery.img", OPTIONS.target_tmp, "RECOVERY") updating_recovery = (source_recovery.data != target_recovery.data) |