diff options
| author | David Turner <digit@android.com> | 2011-08-05 04:00:47 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-08-05 04:00:47 -0700 |
| commit | 86d20497a0bf7d200ce862d76d557b460a5dce00 (patch) | |
| tree | 5f728f0771ce18675ab1df6076f14da0024ef52e | |
| parent | 60a19863995cdfb9be645242983be24e424f37bc (diff) | |
| parent | e4a3bea51fc7b377234b5af7a6cecfd529962f2e (diff) | |
| download | external_qemu-86d20497a0bf7d200ce862d76d557b460a5dce00.zip external_qemu-86d20497a0bf7d200ce862d76d557b460a5dce00.tar.gz external_qemu-86d20497a0bf7d200ce862d76d557b460a5dce00.tar.bz2 | |
Merge "Fixes dataPartition size problem" into tools_r13
| -rw-r--r-- | android/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/main.c b/android/main.c index 37bf34a..3629c83 100644 --- a/android/main.c +++ b/android/main.c @@ -648,7 +648,10 @@ int main(int argc, char **argv) hw->disk_dataPartition_initPath = NULL; } - uint64_t defaultBytes = defaultPartitionSize; + uint64_t defaultBytes = + hw->disk_dataPartition_size == 0 ? + defaultPartitionSize : + convertMBToBytes(hw->disk_dataPartition_size); uint64_t dataBytes; const char* dataPath = hw->disk_dataPartition_initPath; |