diff options
| author | Ying Wang <wangying@google.com> | 2010-09-28 10:45:54 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-09-28 10:45:54 -0700 |
| commit | 421b46e0cb301019563c7ba1c797aa752fc318df (patch) | |
| tree | 38530ce68abca3b7531f4030d0b14e92de74ef4f /tools/releasetools/img_from_target_files | |
| parent | e54320d75998cbec4391be2b04c61164fa2d70fd (diff) | |
| parent | 18c00c5c6abc9a3d781995ddd0225c7488f14ef4 (diff) | |
| download | build-421b46e0cb301019563c7ba1c797aa752fc318df.zip build-421b46e0cb301019563c7ba1c797aa752fc318df.tar.gz build-421b46e0cb301019563c7ba1c797aa752fc318df.tar.bz2 | |
resolved conflicts for merge of 18c00c5c to master
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
Diffstat (limited to 'tools/releasetools/img_from_target_files')
| -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 ef0f24c..488226f 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -65,7 +65,7 @@ def AddUserdata(output_zip): if fstab and fstab["/data"].fs_type.startswith("ext"): build_command = ["mkuserimg.sh", user_dir, img.name, - fstab["/data"].fs_type, "userdata"] + fstab["/data"].fs_type, "data"] if "userdata_size" in OPTIONS.info_dict: build_command.append(str(OPTIONS.info_dict["userdata_size"])) else: |