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]
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 @@
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 @@
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)