aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge from tools_r10The Android Open Source Project2011-03-181-36/+0
|\ | | | | | | Change-Id: I70d9ccafb5912c85baa0711f7e9010bec223efaa
| * Merge "Revert "Merge 29e114d2 from master. do not merge."" into tools_r10Xavier Ducrohet2011-03-181-36/+0
| |\
| | * Revert "Merge 29e114d2 from master. do not merge."Xavier Ducrohet2011-03-181-36/+0
| |/ | | | | | | This reverts commit e36a1cc2561b2ce27d3c0a5b3a7b79d4e8531f0e.
* | merge from tools_r10The Android Open Source Project2011-03-180-0/+0
|\ \ | |/ | | | | Change-Id: Ie201fb1ced829ca29a46210b68fbb1d7dccfba9a
| * Merge "Merge 29e114d2 from master. do not merge." into tools_r10Xavier Ducrohet2011-03-181-0/+36
| |\
| | * Merge 29e114d2 from master. do not merge.David 'Digit' Turner2011-03-181-0/+36
| |/ | | | | | | | | | | | | | | | | | | | | | | Fix touchscreen emulation to return correct min/max coordinate bounds. This is needed by future changes in the input framework that depend on touchscreen devices to properly return the min/max bounds of their absolute pointer coordinates. Fixes bug 4126574 Change-Id: I1ace56d5433be5d97eb79895cd57b6e442245ca0
* | Merge "Fix touchscreen emulation to return correct min/max coordinate bounds."David 'Digit' Turner2011-03-181-0/+36
|\ \
| * | Fix touchscreen emulation to return correct min/max coordinate bounds.David 'Digit' Turner2011-03-181-0/+36
|/ / | | | | | | | | | | | | | | | | | | This is needed by future changes in the input framework that depend on touchscreen devices to properly return the min/max bounds of their absolute pointer coordinates. Fixes bug 4126574 Change-Id: I982c0d8e78fc59912e964af958929d2b0718eaa4
* | Merge "Fix -shell and -logcat options."David 'Digit' Turner2011-03-171-1/+5
|\ \
| * | Fix -shell and -logcat options.David 'Digit' Turner2011-03-181-1/+5
|/ / | | | | | | | | | | They didn't work because the guest was trying to write to the wrong serial port. Change-Id: Ibd68c4b63d0808afcb0cfaffa07c35898e21df9a
* | Merge "Fix write of disk sizes in ini files."David 'Digit' Turner2011-03-161-11/+14
|\ \
| * | Fix write of disk sizes in ini files.David 'Digit' Turner2011-03-151-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | The old implementation always expressed the size as multiples of kilobytes due to an improper order to size checks. For example, 66MB was written as '67584k' instead of '66m', which is correct but sub-optimal. Change-Id: I6365bf4c269ed7d213043182a8ae501713798b8f
* | | Merge "Fix a crash that happened when the content directory didn't have a ↵David 'Digit' Turner2011-03-152-13/+24
|\ \ \ | |/ / |/| | | | | cache.img file."
| * | Fix a crash that happened when the content directory didn't have a cache.img ↵David 'Digit' Turner2011-03-152-13/+24
|/ / | | | | | | | | | | | | | | | | file. This only happened for fresh newly-created AVDs. Existing ones used for testing the emulator already had a cache.img and booted properly. Change-Id: I87901ea5fb1dc6aa7d2bb3dd191de58d972c386f
* | Merge "Fix windows build when USE_CCACHE is defined."David 'Digit' Turner2011-03-141-0/+1
|\ \
| * | Fix windows build when USE_CCACHE is defined.David 'Digit' Turner2011-03-121-0/+1
|/ / | | | | | | | | | | | | This avoids a problem where the Makefile force the use of the non-existing prebuilt/windows/ccache/ccache. Change-Id: Icad0fb91a211787bbe73b169aa4e8046de349679
* | Merge "Improve emulator kernel rebuild script."David 'Digit' Turner2011-03-091-22/+86
|\ \
| * | Improve emulator kernel rebuild script.David 'Digit' Turner2011-03-091-22/+86
|/ / | | | | | | | | | | | | | | | | | | - Add support for building on darwin-x86 - Automatically finds the cross-toolchain (arch-dependent) if --cross=<prefix> is not used. - Add "Auto-config: <option>" message to indicate what was automatically configured - Select appropriate names for output files - Print their name on the terminal in case of success Change-Id: I908392083bf724a426d5029dc0a7dd29e045c7a4
* | Merge "Always prepend a space before kernel parameters."David 'Digit' Turner2011-03-081-0/+1
|\ \
| * | Always prepend a space before kernel parameters.David 'Digit' Turner2011-03-081-0/+1
|/ / | | | | | | | | | | | | It has been reported that in certain cases, qemud would think that the serial device is /dev/ttyS1android.checkjni=1. Change-Id: I977456ef23fb708b284cfe026da07ecce8d03bf1
* | Merge "Add kernel-rebuilding script for the emulator."David 'Digit' Turner2011-03-082-1/+182
|\ \
| * | Add kernel-rebuilding script for the emulator.David 'Digit' Turner2011-03-052-1/+182
| | | | | | | | | | | | | | | | | | Supports both arm and x86. Change-Id: Ib4665eece4433f0a611b5420ef29785eeb26de1a
* | | Merge "x86: Enable KVM mode for Android x86 emulator (update/rebase)"David Turner2011-03-059-1/+1110
|\ \ \ | |/ / |/| |
| * | x86: Enable KVM mode for Android x86 emulator (update/rebase)Jun Nakajima2011-03-049-1/+1110
|/ / | | | | | | | | | | | | | | | | | | This patch enables KVM mode on x86 Linux to boost performance of x86 emulaiton if the hardware-based virtualization feature is present on the host machine. Change-Id: I4b24474b3ec115a3b9a7bf017801f4f610253b09 Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* | Merge "look for the pc-bios files in the SDK tools/lib/pc-bios directory"David Turner2011-03-041-11/+19
|\ \
| * | look for the pc-bios files in the SDK tools/lib/pc-bios directoryBruce Beare2011-03-021-11/+19
|/ / | | | | | | | | Change-Id: I6d546f79617032dea0d72d8d38dab3016e6bd4a0 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | Merge "Fix the standalone emulator build."David 'Digit' Turner2011-03-023-2/+8
|\ \
| * | Fix the standalone emulator build.David 'Digit' Turner2011-03-023-2/+8
|/ / | | | | | | | | | | The previous commit broke it due to the way it handled LOCAL_AR. Change-Id: I3458f9306b3fca9771d868673ae89f4d995aeec3
* | Merge "qemu logging extensions"David Turner2011-03-026-42/+152
|\ \
| * | qemu logging extensionsrich cannings2011-03-016-42/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | (1) Clear the logs upon receiving a SIGUSR1 signal (2) Add logging timestamps for network connections (3) Extended TCP redirect logs to include local src ip/port and fixed byte-ordering in log files Change-Id: I51e7293c8eeb5979a92e67f52f1c6416400d83c6
* | | Merge "Avoid redefining HOST_CC/CXX when building the emulator."David 'Digit' Turner2011-03-021-4/+5
|\ \ \ | |/ / |/| |
| * | Avoid redefining HOST_CC/CXX when building the emulator.David 'Digit' Turner2011-03-021-4/+5
|/ / | | | | | | | | | | | | | | | | HOST_CC and HOST_CXX are defined/controlled by the build system. We don't want to redefine them here because this forces, on Linux, the use of the 32-bit host toolchain for all other host modules built after external/qemu. Change-Id: Ic9dc32b56f5e8d28559b5375178768726ad5cdcc
* | Merge "Move AVD name initialization to the core."David 'Digit' Turner2011-03-014-2/+24
|\ \
| * | Move AVD name initialization to the core.David 'Digit' Turner2011-03-014-2/+24
|/ / | | | | | | | | | | | | Use a hardware property to send the AVD name to the core. The -android-avdname core option is still supported though. Change-Id: I4daac5c9fb65ed5261b5c04c1e1a18daed057a3f
* | Merge "Move some serial ports initialization to the core."David 'Digit' Turner2011-03-016-82/+117
|\ \
| * | Move some serial ports initialization to the core.David 'Digit' Turner2011-03-016-82/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the initialization of the ports used by qemud and the "kmsg" component to the core. + Gets rid of the -old-system option used to suppot pre-1.4 Android system. We don't officially support anything before 1.5 anyway. Change-Id: Ied7e284d952adfd3419d96c39a7c48761f1b3f5c
* | | Merge "Move data partition initialization to core."David 'Digit' Turner2011-03-017-620/+116
|\ \ \ | |/ /
| * | Move data partition initialization to core.David 'Digit' Turner2011-03-017-620/+116
|/ / | | | | | | Change-Id: I3c2b4668593391026da028194503fc87246e44ba
* | Merge "Move system image initialization to core."David 'Digit' Turner2011-03-017-90/+225
|\ \
| * | Move system image initialization to core.David 'Digit' Turner2011-03-017-90/+225
| | | | | | | | | | | | Change-Id: Ic8da3ccaed9bab7dbb44c0bb341b0dba20b90980
* | | Merge "Move snapshot storage initialization to the core."David 'Digit' Turner2011-03-017-66/+104
|\ \ \ | |/ /
| * | Move snapshot storage initialization to the core.David 'Digit' Turner2011-03-017-66/+104
| | | | | | | | | | | | Change-Id: I2c2b782fe4711cc8c323433e7976222b878cf679
* | | Merge "Move the SD Card initialization to the core."David 'Digit' Turner2011-03-017-53/+95
|\ \ \ | |/ /
| * | Move the SD Card initialization to the core.David 'Digit' Turner2011-03-017-53/+95
| | | | | | | | | | | | Change-Id: I2c8fa2a7df3d79ed4222296a93b787994a8ee11d
* | | Merge "Move cache partition initialization to core."David 'Digit' Turner2011-03-016-55/+70
|\ \ \ | |/ /
| * | Move cache partition initialization to core.David 'Digit' Turner2011-03-016-55/+70
| | | | | | | | | | | | Change-Id: I1f887e6f8fc38e43b1fff3f7bab3814b52542762
* | | Merge "Move kernel/ramdisk initialization to the core."David 'Digit' Turner2011-03-017-75/+124
|\ \ \ | |/ /
| * | Move kernel/ramdisk initialization to the core.David 'Digit' Turner2011-03-017-75/+124
| | | | | | | | | | | | | | | | | | | | | The QEMU -kernel, -initrd and -append options are still supported for overriding the hardware configuration. Change-Id: I034d9e25d0a23341086aa052f449db5de50b2c8d
* | | Merge "Rework AvdInfo processing."David 'Digit' Turner2011-03-015-575/+719
|\ \ \ | |/ /
| * | Rework AvdInfo processing.David 'Digit' Turner2011-03-015-575/+719
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the code in android/avd/info.c to prepare for future patches that will move initialization disk images to the core (including locking and creating temporary files). + Remove AvdInfo structure dependencies on many of the functions, to make them more generic/usable. + Remove skin-related processing from avdInfo_new() and avdInfo_newFromBuild(). + Remove avdInfo_getSkinName() and avdInfo_getSkinDir(), and replace them with a single avdInfo_getSkinInfo(). + Rename 'qemu-hardware.ini' to 'hardware-qemu.ini' to follow the same naming convention than the one used for disk images (e.g. "userdata-qemu.img" and "system-qemu.img") Change-Id: I32cb0a5850f8c0b9df93d2630552941fd2b461c1
generated by cgit v1.1 at 2024-09-28 03:44:24 +0000