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

Merge \"Remove obsolete MTD support from the releasetools scripts.\"

Browse Source 
am: 63fc2b6766

Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c
This commit is contained in:
Elliott Hughes
2016-06-17 04:59:26 +00:00
committed by android-build-merger
parent 821fb422cd 63fc2b6766
commit ece6ff869c
4 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/edify_generator.py
View File

@@ -170,7 +170,7 @@ class EdifyGenerator(object):
self.script.append("set_progress(%f);" % (frac,))
def PatchCheck(self, filename, *sha1):
"""Check that the given file (or MTD reference) has one of the
"""Check that the given file has one of the
given *sha1 hashes, checking the version saved in cache if the
file does not match."""
self.script.append(
@@ -180,7 +180,7 @@ class EdifyGenerator(object):
common.ErrorCode.BAD_PATCH_FILE, filename))
def Verify(self, filename):
"""Check that the given file (or MTD reference) has one of the
"""Check that the given file has one of the
given hashes (encoded in the filename)."""
self.script.append(
'apply_patch_check("{filename}") && '
@@ -189,7 +189,7 @@ class EdifyGenerator(object):
filename=filename))
def FileCheck(self, filename, *sha1):
"""Check that the given file (or MTD reference) has one of the
"""Check that the given file has one of the
given *sha1 hashes."""
self.script.append('assert(sha1_check(read_file("%s")' % (filename,) +
"".join([', "%s"' % (i,) for i in sha1]) +
@@ -329,11 +329,7 @@ class EdifyGenerator(object):
p = fstab[mount_point]
partition_type = common.PARTITION_TYPES[p.fs_type]
args = {'device': p.device, 'fn': fn}
if partition_type == "MTD":
self.script.append(
'write_raw_image(package_extract_file("%(fn)s"), "%(device)s");'
% args)
elif partition_type == "EMMC":
if partition_type == "EMMC":
if mapfn:
args["map"] = mapfn
self.script.append(