diff options
| author | Ying Wang <wangying@google.com> | 2010-08-24 11:50:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 11:50:46 -0700 |
| commit | 567ec8ede3e7cda75c1f3d474d14d78b12a6765f (patch) | |
| tree | c5443e5416d768a126be214a5d8a7068211c9c66 /tools | |
| parent | b4df348997795f2e60476ca4b67f9fe5501321db (diff) | |
| parent | ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51 (diff) | |
| download | build-567ec8ede3e7cda75c1f3d474d14d78b12a6765f.zip build-567ec8ede3e7cda75c1f3d474d14d78b12a6765f.tar.gz build-567ec8ede3e7cda75c1f3d474d14d78b12a6765f.tar.bz2 | |
am ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp
* commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/releasetools/img_from_target_files | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files index 98a00fb..44bed9c 100755 --- a/tools/releasetools/img_from_target_files +++ b/tools/releasetools/img_from_target_files @@ -83,7 +83,8 @@ def AddUserdata(output_zip): p.communicate() assert p.returncode == 0, "build userdata.img image failed" - common.CheckSize(img.name, "userdata.img") + if USERIMAGE_OPTIONS.fs_type is None or not USERIMAGE_OPTIONS.fs_type.startswith("ext"): + common.CheckSize(img.name, "userdata.img") output_zip.write(img.name, "userdata.img") img.close() os.rmdir(user_dir) @@ -131,7 +132,8 @@ def AddSystem(output_zip): data = img.read() img.close() - common.CheckSize(data, "system.img") + if USERIMAGE_OPTIONS.fs_type is None or not USERIMAGE_OPTIONS.fs_type.startswith("ext"): + common.CheckSize(data, "system.img") common.ZipWriteStr(output_zip, "system.img", data) |