diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-10 16:52:19 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-02-10 17:52:56 +0100 |
| commit | 5377c5bfde6ba62490417bb0a7d7c1be1151692e (patch) | |
| tree | e8d1af24005c5fe9de2397fbd13cfe6f71c29f80 /android/avd | |
| parent | 2507cab8a78fb609461a2b9cc4708bab60fc53a4 (diff) | |
| download | external_qemu-5377c5bfde6ba62490417bb0a7d7c1be1151692e.zip external_qemu-5377c5bfde6ba62490417bb0a7d7c1be1151692e.tar.gz external_qemu-5377c5bfde6ba62490417bb0a7d7c1be1151692e.tar.bz2 | |
Correct auto-detection of default VM heap size.
This patch removes the need for the -m <memory> core option.
Instead, the RAM size is taken by default from qemu-hardware.ini.
Also, the default value of vm.heapSize is no longer 16MB, it is
now adjusted based on the RAM size (16/32/48 values)
+ Get rid of core -lcd-density option (use .ini file instead)
Change-Id: I93919926b61a132c7943a1bb2c41f7a3ab7f2d2f
Diffstat (limited to 'android/avd')
| -rw-r--r-- | android/avd/hardware-properties.ini | 5 | ||||
| -rw-r--r-- | android/avd/hw-config-defs.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini index 79263a1..a936603 100644 --- a/android/avd/hardware-properties.ini +++ b/android/avd/hardware-properties.ini @@ -24,6 +24,8 @@ # # Ram size +# Default value will be computed based on screen pixels +# or skin version name = hw.ramSize type = integer default = 0 @@ -162,9 +164,10 @@ description = Must be one of 120, 160 or 240. A value used to roughly describe t # Maximum VM heap size # Higher values are required for high-dpi devices +# Default will depend on RAM size. name = vm.heapSize type = integer -default = 16 +default = 0 abstract = Max VM application heap size description = The maximum heap size a Dalvik application might allocate before being killed by the system. Value is in megabytes. diff --git a/android/avd/hw-config-defs.h b/android/avd/hw-config-defs.h index 8d58478..5f97a25 100644 --- a/android/avd/hw-config-defs.h +++ b/android/avd/hw-config-defs.h @@ -167,7 +167,7 @@ HWCFG_INT( HWCFG_INT( vm_heapSize, "vm.heapSize", - 16, + 0, "Max VM application heap size", "The maximum heap size a Dalvik application might allocate before being killed by the system. Value is in megabytes.") |