merge in nyc-mr2-release history after reset to nyc-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 7bab8c7..5a012b9 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=N2F48
+export BUILD_ID=NYC
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 24ecd15..e141da0 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -109,7 +109,8 @@
Args:
partition_size: the size of the partition to be verified.
Returns:
- The size of the partition adjusted for verity metadata.
+ A tuple of the size of the partition adjusted for verity metadata, and
+ the size of verity metadata.
"""
key = "%d %d" % (partition_size, fec_supported)
if key in AdjustPartitionSizeForVerity.results:
@@ -121,27 +122,31 @@
# verity tree and fec sizes depend on the partition size, which
# means this estimate is always going to be unnecessarily small
- lo = partition_size - GetVeritySize(hi, fec_supported)
+ verity_size = GetVeritySize(hi, fec_supported)
+ lo = partition_size - verity_size
result = lo
# do a binary search for the optimal size
while lo < hi:
i = ((lo + hi) // (2 * BLOCK_SIZE)) * BLOCK_SIZE
- size = i + GetVeritySize(i, fec_supported)
- if size <= partition_size:
+ v = GetVeritySize(i, fec_supported)
+ if i + v <= partition_size:
if result < i:
result = i
+ verity_size = v
lo = i + BLOCK_SIZE
else:
hi = i
- AdjustPartitionSizeForVerity.results[key] = result
- return result
+ AdjustPartitionSizeForVerity.results[key] = (result, verity_size)
+ return (result, verity_size)
AdjustPartitionSizeForVerity.results = {}
-def BuildVerityFEC(sparse_image_path, verity_path, verity_fec_path):
- cmd = "fec -e %s %s %s" % (sparse_image_path, verity_path, verity_fec_path)
+def BuildVerityFEC(sparse_image_path, verity_path, verity_fec_path,
+ padding_size):
+ cmd = "fec -e -p %d %s %s %s" % (padding_size, sparse_image_path,
+ verity_path, verity_fec_path)
print cmd
status, output = commands.getstatusoutput(cmd)
if status:
@@ -207,7 +212,7 @@
def BuildVerifiedImage(data_image_path, verity_image_path,
verity_metadata_path, verity_fec_path,
- fec_supported):
+ padding_size, fec_supported):
if not Append(verity_image_path, verity_metadata_path,
"Could not append verity metadata!"):
return False
@@ -215,7 +220,7 @@
if fec_supported:
# build FEC for the entire partition, including metadata
if not BuildVerityFEC(data_image_path, verity_image_path,
- verity_fec_path):
+ verity_fec_path, padding_size):
return False
if not Append(verity_image_path, verity_fec_path, "Could not append FEC!"):
@@ -253,7 +258,7 @@
True on success, False otherwise.
"""
# get properties
- image_size = prop_dict["partition_size"]
+ image_size = int(prop_dict["partition_size"])
block_dev = prop_dict["verity_block_device"]
signer_key = prop_dict["verity_key"] + ".pk8"
if OPTIONS.verity_signer_path is not None:
@@ -284,10 +289,17 @@
return False
# build the full verified image
+ target_size = int(prop_dict["original_partition_size"])
+ verity_size = int(prop_dict["verity_size"])
+
+ padding_size = target_size - image_size - verity_size
+ assert padding_size >= 0
+
if not BuildVerifiedImage(out_file,
verity_image_path,
verity_metadata_path,
verity_fec_path,
+ padding_size,
fec_supported):
shutil.rmtree(tempdir_name, ignore_errors=True)
return False
@@ -358,12 +370,13 @@
# verified.
if verity_supported and is_verity_partition:
partition_size = int(prop_dict.get("partition_size"))
- adjusted_size = AdjustPartitionSizeForVerity(partition_size,
- verity_fec_supported)
+ (adjusted_size, verity_size) = AdjustPartitionSizeForVerity(partition_size,
+ verity_fec_supported)
if not adjusted_size:
return False
prop_dict["partition_size"] = str(adjusted_size)
prop_dict["original_partition_size"] = str(partition_size)
+ prop_dict["verity_size"] = str(verity_size)
if fs_type.startswith("ext"):
build_command = ["mkuserimg.sh"]
