Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb

This commit is contained in:
Ken Sumrall 2011-01-19 17:35:30 -08:00 committed by Android (Google) Code Review
commit 6f2f23a46f

View file

@ -168,17 +168,21 @@ class EdifyGenerator(object):
"""Format the given partition, specified by its mount point (eg, """Format the given partition, specified by its mount point (eg,
"/system").""" "/system")."""
reserve_size = 0
fstab = self.info.get("fstab", None) fstab = self.info.get("fstab", None)
if fstab: if fstab:
p = fstab[partition] p = fstab[partition]
self.script.append('format("%s", "%s", "%s");' % # Reserve the last 16 Kbytes of an EMMC /data for the crypto footer
(p.fs_type, common.PARTITION_TYPES[p.fs_type], p.device)) if partition == "/data" and common.PARTITION_TYPES[p.fs_type] == "EMMC":
reserve_size = -16384
self.script.append('format("%s", "%s", "%s", "%s");' %
(p.fs_type, common.PARTITION_TYPES[p.fs_type], p.device, reserve_size)
else: else:
# older target-files without per-partition types # older target-files without per-partition types
partition = self.info.get("partition_path", "") + partition partition = self.info.get("partition_path", "") + partition
self.script.append('format("%s", "%s", "%s");' % self.script.append('format("%s", "%s", "%s", "%s");' %
(self.info["fs_type"], self.info["partition_type"], (self.info["fs_type"], self.info["partition_type"],
partition)) partition, reserve_size))
def DeleteFiles(self, file_list): def DeleteFiles(self, file_list):
"""Delete all files in file_list.""" """Delete all files in file_list."""