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]
This commit is contained in:
commit
567ec8ede3
|
@ -83,7 +83,8 @@ def AddUserdata(output_zip):
|
||||||
p.communicate()
|
p.communicate()
|
||||||
assert p.returncode == 0, "build userdata.img image failed"
|
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")
|
output_zip.write(img.name, "userdata.img")
|
||||||
img.close()
|
img.close()
|
||||||
os.rmdir(user_dir)
|
os.rmdir(user_dir)
|
||||||
|
@ -131,7 +132,8 @@ def AddSystem(output_zip):
|
||||||
data = img.read()
|
data = img.read()
|
||||||
img.close()
|
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)
|
common.ZipWriteStr(output_zip, "system.img", data)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue