StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread

Browse Source 
Merge commit '25df2a980d87f011fe702b6209c3b71b2824fc18'

* commit '25df2a980d87f011fe702b6209c3b71b2824fc18':
  remove remaining refs to max_image_sizes
This commit is contained in:
Doug Zongker
2010-09-17 08:24:37 -07:00
committed by Android Git Automerger
parent 1b3e028eb0 25df2a980d
commit cb269124bb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/common.py
View File

@@ -35,7 +35,6 @@ if not hasattr(os, "SEEK_SET"):
class Options(object): pass
OPTIONS = Options()
OPTIONS.search_path = "out/host/linux-x86"
OPTIONS.max_image_size = {}
OPTIONS.verbose = False
OPTIONS.tempfiles = []
OPTIONS.device_specific = None
@@ -104,7 +103,8 @@ def LoadInfoDict(zip):
data = zip.read("META/imagesizes.txt")
for line in data.split("\n"):
if not line: continue
name, value = line.strip().split(None, 1)
name, value = line.split(" ", 1)
if not value: continue
if name == "blocksize":
d[name] = value
else:
@@ -311,7 +311,8 @@ def CheckSize(data, target, info_dict):
fs_type = info_dict.get("fs_type", None)
if not fs_type: return
limit = OPTIONS.max_image_size.get(target, None)
if target.endswith(".img"): target = target[:-4]
limit = info_dict.get(target + "_size", None)
if limit is None: return
if fs_type == "yaffs2":