Improve sdcard partitioning process
-Improve code for partitioning sdcards
-Allow user to select a device for partitioning (must be removable)
-Use sgdisk to partition sdcards
-Set default sizes for ext and swap to 0
-Change increments for ext to 256MB and swap to 64MB
Note: sgdisk is included in 6.0. I have included a static prebuilt
sgdisk for trees that do not have sgdisk, however the prebuilt
sgdisk is a decent bit larger than the old parted binary. The old
parted binary is quite old at this point and we only have it for
armv7a. sgdisk should be maintained by AOSP and can be built from
source so it should work across architectures.
Change-Id: Ib80882d9b5776e5e9358b11340fba392e6f1ae09
diff --git a/partition.cpp b/partition.cpp
index 2f37d6f..a8de4a9 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -880,23 +880,9 @@
}
unsigned long long TWPartition::IOCTL_Get_Block_Size() {
- unsigned long block_device_size;
- int ret = 0;
-
Find_Actual_Block_Device();
- int fd = open(Actual_Block_Device.c_str(), O_RDONLY);
- if (fd < 0) {
- LOGINFO("Find_Partition_Size: Failed to open '%s', (%s)\n", Actual_Block_Device.c_str(), strerror(errno));
- } else {
- ret = ioctl(fd, BLKGETSIZE, &block_device_size);
- close(fd);
- if (ret) {
- LOGINFO("Find_Partition_Size: ioctl error: (%s)\n", strerror(errno));
- } else {
- return (unsigned long long)(block_device_size) * 512LLU;
- }
- }
- return 0;
+
+ return TWFunc::IOCTL_Get_Block_Size(Actual_Block_Device.c_str());
}
bool TWPartition::Find_Partition_Size(void) {