summaryrefslogtreecommitdiffstats
path: root/tools/releasetools/img_from_target_files
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-08-24 11:18:07 -0700
committerYing Wang <wangying@google.com>2010-08-24 11:18:07 -0700
commitee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51 (patch)
tree1c38028a0ff5de781667dcfe6b61ed949129ded8 /tools/releasetools/img_from_target_files
parent34acfcf6858fa4c9183d4e4d2e10f15cf932285f (diff)
downloadbuild-ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51.zip
build-ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51.tar.gz
build-ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51.tar.bz2
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920 Change-Id: I81437996670a61e10284293d25a08da8907ad296
Diffstat (limited to 'tools/releasetools/img_from_target_files')
-rwxr-xr-xtools/releasetools/img_from_target_files6
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)