diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-21 20:10:32 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2010-09-21 20:10:32 -0700 |
| commit | 539db3b845bba83b6e1340818b19f7581c3b6bc0 (patch) | |
| tree | cbfb58f558b829fc332544a6381966e26bfc51ab /tools/releasetools | |
| parent | 58118ccc565db991cd82ae5f4cbd0a5057438dbc (diff) | |
| parent | e1daf61d43a4252594e1e51060f342480ea26d42 (diff) | |
| download | build-539db3b845bba83b6e1340818b19f7581c3b6bc0.zip build-539db3b845bba83b6e1340818b19f7581c3b6bc0.tar.gz build-539db3b845bba83b6e1340818b19f7581c3b6bc0.tar.bz2 | |
resolved conflicts for merge of e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
Diffstat (limited to 'tools/releasetools')
| -rwxr-xr-x | tools/releasetools/img_from_target_files | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 7a32621..ef0f24c 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -115,7 +115,7 @@ def AddSystem(output_zip): build_command = ["mkuserimg.sh", os.path.join(OPTIONS.input_tmp, "system"), img.name, fstab["/system"].fs_type, "system"] - if "system_img" in OPTIONS.info_dict: + if "system_size" in OPTIONS.info_dict: build_command.append(str(OPTIONS.info_dict["system_size"])) else: build_command = ["mkyaffs2image", "-f"] |