diff options
| author | Maciek Molerus <maciek@google.com> | 2011-06-15 22:26:35 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-08-04 13:15:17 +0200 |
| commit | e4a3bea51fc7b377234b5af7a6cecfd529962f2e (patch) | |
| tree | 5f728f0771ce18675ab1df6076f14da0024ef52e /android/main.c | |
| parent | 60a19863995cdfb9be645242983be24e424f37bc (diff) | |
| download | external_qemu-e4a3bea51fc7b377234b5af7a6cecfd529962f2e.zip external_qemu-e4a3bea51fc7b377234b5af7a6cecfd529962f2e.tar.gz external_qemu-e4a3bea51fc7b377234b5af7a6cecfd529962f2e.tar.bz2 | |
Fixes dataPartition size problem
This is a back-port from master to tools_r13
Fixes the problem when disk.systemPartition.size
avd setting gets overrided by default 66 MBytes
hardcoded in qEmu.
Change-Id: Ie15a820c60f48320ee8ca2ea60e4dcb65b762cf9
Orig-Change-Id: Ideb7ca172cb72076c83037f823b86ede2442d6f9
Diffstat (limited to 'android/main.c')
| -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; |