diff options
author | Ying Wang <wangying@google.com> | 2010-08-25 21:21:43 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 21:21:43 -0700 |
commit | f5127dfc3dce86e0e5fd04f6011debdea125cf1f (patch) | |
tree | 405efe6a8558ede2343f90f5a2bdcd5d47d88636 /tools/releasetools | |
parent | 1c19026961796a9af817a6b8ad04d03c2ed8bf1c (diff) | |
parent | 485bd44d0d78f9f612075e17db1adb281741c84f (diff) | |
download | build-f5127dfc3dce86e0e5fd04f6011debdea125cf1f.zip build-f5127dfc3dce86e0e5fd04f6011debdea125cf1f.tar.gz build-f5127dfc3dce86e0e5fd04f6011debdea125cf1f.tar.bz2 |
am 485bd44d: am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'
* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
Fix mkyaffs2image extra flags in the release tools.
Diffstat (limited to 'tools/releasetools')
-rw-r--r-- | tools/releasetools/common.py | 12 | ||||
-rwxr-xr-x | tools/releasetools/img_from_target_files | 16 |
2 files changed, 24 insertions, 4 deletions
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) |