summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2018-08-02 12:31:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-02 12:31:29 -0700
commit06dda553d21b1b1ae132755c5419ab54112522d0 (patch)
tree55e011042e307b68e8da91ec4213c1949c233e57
parentc073754f7f1908652a60b5c592417824bdfe54b1 (diff)
parent1b184b4451cc991893dbbf16c1f610329448c0ff (diff)
downloadextras-06dda553d21b1b1ae132755c5419ab54112522d0.tar.gz
Merge "lpmake: Pass the block size to MetadataBuilder."
am: 1b184b4451 Change-Id: I947f809c536ff35d392e8d925bb280ea1dce61ce
-rw-r--r--partition_tools/lpmake.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/partition_tools/lpmake.cc b/partition_tools/lpmake.cc
index 493e4118..8b0dfad1 100644
--- a/partition_tools/lpmake.cc
+++ b/partition_tools/lpmake.cc
@@ -188,7 +188,9 @@ int main(int argc, char* argv[]) {
return EX_USAGE;
}
- BlockDeviceInfo device_info(blockdevice_size, alignment, alignment_offset);
+ // Note that we take the block_size to mean both the logical block size and
+ // the block size for libsparse.
+ BlockDeviceInfo device_info(blockdevice_size, alignment, alignment_offset, block_size);
std::unique_ptr<MetadataBuilder> builder =
MetadataBuilder::New(device_info, metadata_size, metadata_slots);