diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-17 08:24:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 08:24:37 -0700 |
| commit | cb269124bbdf5cde7f033ba23fc90c71db7e475b (patch) | |
| tree | 3a714e479730fe5fde25f546921900663007906c /tools/releasetools/img_from_target_files | |
| parent | 1b3e028eb094dbde553bb59c98ceab7630f1f49a (diff) | |
| parent | 25df2a980d87f011fe702b6209c3b71b2824fc18 (diff) | |
| download | build-cb269124bbdf5cde7f033ba23fc90c71db7e475b.zip build-cb269124bbdf5cde7f033ba23fc90c71db7e475b.tar.gz build-cb269124bbdf5cde7f033ba23fc90c71db7e475b.tar.bz2 | |
am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '25df2a980d87f011fe702b6209c3b71b2824fc18'
* commit '25df2a980d87f011fe702b6209c3b71b2824fc18':
remove remaining refs to max_image_sizes
Diffstat (limited to 'tools/releasetools/img_from_target_files')
| -rwxr-xr-x | tools/releasetools/img_from_target_files | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 140be42..c756086 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -64,8 +64,8 @@ def AddUserdata(output_zip): if OPTIONS.info_dict.get("fs_type", "").startswith("ext"): build_command = ["mkuserimg.sh", user_dir, img.name, OPTIONS.info_dict["fs_type"], "userdata"] - if "userdata.img" in OPTIONS.max_image_size: - build_command.append(str(OPTIONS.max_image_size["userdata.img"])) + if "userdata_size" in OPTIONS.info_dict: + build_command.append(str(OPTIONS.info_dict["userdata_size"])) else: build_command = ["mkyaffs2image", "-f"] extra = OPTIONS.info_dict.get("mkyaffs2_extra_flags", None) @@ -112,8 +112,8 @@ def AddSystem(output_zip): build_command = ["mkuserimg.sh", os.path.join(OPTIONS.input_tmp, "system"), img.name, OPTIONS.info_dict["fs_type"], "system"] - if "system.img" in OPTIONS.max_image_size: - build_command.append(str(OPTIONS.max_image_size["system.img"])) + if "system_img" in OPTIONS.info_dict: + build_command.append(str(OPTIONS.info_dict["system_size"])) else: build_command = ["mkyaffs2image", "-f"] extra = OPTIONS.info_dict.get("mkyaffs2_extra_flags", None) |