commit f758411e012389b1d9699e10cae6f1ac98cca419
author Maciek Molerus <maciek@google.com> Wed Jun 15 22:26:35 2011 +0200
committer Maciek Molerus <maciek@google.com> Fri Jun 17 17:33:40 2011 +0200
tree 2c9952b18a9cd5f5c737445fe802c615f4531f71
parent a403d8a56953e68ea14f6bc5b28c8e667f0af267

Fixes dataPartition size problem

Fixes the problem when disk.systemPartition.size
avd setting gets overrided by default 66 MBytes
hardcoded in qEmu.

Change-Id: Ideb7ca172cb72076c83037f823b86ede2442d6f9

android/main.c

diff --git a/android/main.c b/android/main.c
index 77d3c69..29fc079 100644
--- a/android/main.c
+++ b/android/main.c
@@ -649,7 +649,10 @@
             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;