diff options
| -rw-r--r-- | core/Makefile | 3 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 12 | ||||
| -rwxr-xr-x | tools/releasetools/img_from_target_files | 16 |
3 files changed, 27 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 26cc05f..f66710c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1068,6 +1068,9 @@ else $(hide) echo "partition_type=MTD" >> $(zip_root)/META/misc_info.txt endif $(hide) echo "$(tool_extensions)" > $(zip_root)/META/tool-extensions.txt +ifdef mkyaffs2_extra_flags + $(hide) echo "$(mkyaffs2_extra_flags)" > $(zip_root)/META/mkyaffs2-extra-flags.txt +endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @# Run fs_config on all the system files in the zip, and save the output diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index ce217eb..4db9095 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -36,6 +36,7 @@ OPTIONS.verbose = False OPTIONS.tempfiles = [] OPTIONS.device_specific = None OPTIONS.extras = {} +OPTIONS.mkyaffs2_extra_flags = None # Values for "certificate" in apkcerts that mean special things. @@ -103,6 +104,17 @@ def LoadMaxSizes(info): raise +def LoadMkyaffs2ExtraFlags(): + """Load mkyaffs2 extra flags.""" + try: + fn = os.path.join(OPTIONS.input_tmp, "META", "mkyaffs2-extra-flags.txt"); + if os.access(fn, os.F_OK): + OPTIONS.mkyaffs2_extra_flags = open(fn).read().rstrip("\n") + except IOError, e: + if e.errno == errno.ENOENT: + pass + + def BuildAndAddBootableImage(sourcedir, targetname, output_zip): """Take a kernel, cmdline, and ramdisk directory from the input (in 'sourcedir'), and turn them into a boot image. Put the boot image diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index d180998..b1f67a6 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -77,8 +77,11 @@ def AddUserdata(output_zip): if "userdata.img" in OPTIONS.max_image_size: build_command.append(str(OPTIONS.max_image_size["userdata.img"])) else: - build_command = ["mkyaffs2image", "-f", - user_dir, img.name] + build_command = ["mkyaffs2image", "-f"] + if OPTIONS.mkyaffs2_extra_flags is not None: + build_command.append(OPTIONS.mkyaffs2_extra_flags); + build_command.append(user_dir) + build_command.append(img.name) p = common.Run(build_command); p.communicate() @@ -122,8 +125,11 @@ def AddSystem(output_zip): if "system.img" in OPTIONS.max_image_size: build_command.append(str(OPTIONS.max_image_size["system.img"])) else: - build_command = ["mkyaffs2image", "-f", - os.path.join(OPTIONS.input_tmp, "system"), img.name] + build_command = ["mkyaffs2image", "-f"] + if OPTIONS.mkyaffs2_extra_flags is not None: + build_command.append(OPTIONS.mkyaffs2_extra_flags); + build_command.append(os.path.join(OPTIONS.input_tmp, "system")) + build_command.append(img.name) p = common.Run(build_command) p.communicate() @@ -174,6 +180,8 @@ def main(argv): print " image size limits." print + common.LoadMkyaffs2ExtraFlags() + output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED) common.AddBoot(output_zip) |