aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
* | Merge "Simplify kernel parameters processing."David 'Digit' Turner2011-03-011-46/+36
|\ \
| * | Simplify kernel parameters processing.David 'Digit' Turner2011-03-011-46/+36
|/ / | | | | | | | | | | | | This change simplifies the code that deals with kernel parameters in the core by using a stralloc_t (dynamic strings). Change-Id: I73cf2d1461a3cb1aa4511d74fd34249f0f8b58a2
* | Merge "Remove CONFIG_ANDROID_SNAPSHOTS macro."David 'Digit' Turner2011-03-0112-68/+8
|\ \
| * | Remove CONFIG_ANDROID_SNAPSHOTS macro.David 'Digit' Turner2011-03-0112-68/+8
| | | | | | | | | | | | | | | | | | The feature is no longer optional. Change-Id: I4558f12e3804e42069e8a3e6bcf0837d350206ed
* | | Merge "Remove un-needed "-netspeed full" and "-netdelay none"."David 'Digit' Turner2011-03-012-9/+14
|\ \ \ | |/ /
| * | Remove un-needed "-netspeed full" and "-netdelay none".David 'Digit' Turner2011-03-012-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the use of "-netspeed full" and "-netdelay none" when starting a core, since these values correspond to the default. Usually, these were triggered by the values found in the skin files. Change-Id: I88944c6736dc721a8645b1c7d87bc0cb949feec4
* | | Merge "Remove un-needed -clock unix core option."David 'Digit' Turner2011-03-012-11/+8
|\ \ \ | |/ /
| * | Remove un-needed -clock unix core option.David 'Digit' Turner2011-03-012-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the '-clock unix' used to start the core on Linux. We do that by moving the problematic 'dynticks' clock to the end of the list in qemu-timer.c. The effect is that the unix clock will become the default for normal usage. You can still use the dynticks one for experimentation with -qemu -clock dynticks though. Change-Id: Ia7a8b2b262c62e8b80a82d6dbadec25964774b57
* | | Merge "Prevent hardware-qemu.ini overwrites."David 'Digit' Turner2011-03-011-2/+12
|\ \ \ | |/ /
| * | Prevent hardware-qemu.ini overwrites.David 'Digit' Turner2011-03-011-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When launching two instances of the same AVD, we need to ensure that we don't end-up overwriting the hardware-qemu.ini in the content directory. Note that this case is supported at the moment. Both the system and data partition will be backed by a temporary file when this is detected. Change-Id: I2c5d9195edc4c5be3b889c8da38cb1c7cae3662a
* | | Merge "Quote concatenated QEMU options when -verbose is used."David 'Digit' Turner2011-03-012-2/+9
|\ \ \ | |/ /
| * | Quote concatenated QEMU options when -verbose is used.David 'Digit' Turner2011-03-012-2/+9
|/ / | | | | | | Change-Id: I2d95fa0aa9a5f679372dfd1ae7c7cec906c3049d
* | Merge "Fix sensor-related snapshot resume failure."David 'Digit' Turner2011-02-282-2/+13
|\ \
| * | Fix sensor-related snapshot resume failure.David 'Digit' Turner2011-02-242-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | A snapshot saved with the Tools r9 emulator couldn't be restored properly because we added another sensor (proximity) in Tools r10. Provide code to deal with this case properly and avoid a nasty crash. Change-Id: Ifc395c12496a599eb4ae02e089fe8e13a90865b4
* | | Merge "x86: Fixing audio."David Turner2011-02-252-1/+7
|\ \ \
| * | | x86: Fixing audio.Jun Nakajima2011-02-242-1/+7
|/ / / | | | | | | | | | | | | | | | Change-Id: I0614450cd512d52bf24020dda1c933f0b22cb09b Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>