aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: Add ANDROID-TRACING.TXT to document how tracing worksDavid 'Digit' Turner2010-06-161-0/+66
| | | | Change-Id: I3a1cbe3f64cc222ce0bda1aafcbb02700c281277
* Moved BLOCK and some hw/* files to emulator core libraryVladimir Chtchetkine2010-06-141-16/+27
| | | | Change-Id: I73ed639c5e4e30d39b961721d50c3faf3bd3b177
* Enable --mingw option in android-configure.shDavid 'Digit' Turner2010-06-102-7/+102
| | | | | | This should ease testing of the Windows build during development. Change-Id: I45cc9e396a0e82d764cf7a27fd40ad7c5367c51a
* Remove debug tracesDavid 'Digit' Turner2010-06-101-3/+0
| | | | Change-Id: Id1637165a9a2e4ef2923e730f85c1448bcf3bd56
* Fix the windows build.David 'Digit' Turner2010-06-101-1/+14
| | | | | | It looks like the mingw32 linker has some issues with WinMain() being in a static library. Change-Id: I06e61ba3ede40c2f72c97949d13dee8aafdcc7d9
* Defined EMULATOR_CORE_CFLAGS, and EMULATOR_UI_CFLAGSVladimir Chtchetkine2010-06-101-47/+19
| | | | Change-Id: I923304bd56417260cb244ac4a1d508aa1589bbb4
* Merge "Separate emulator build into three parts: core lib, UI lib, and the ↵Vladimir Chtchetkine2010-06-101-42/+105
|\ | | | | | | executable."
| * Separate emulator build into three parts: core lib, UI lib, and the executable.Vladimir Chtchetkine2010-06-101-42/+105
| | | | | | | | Change-Id: I792ed4d14686acc3f9379f4ac6200fa2046ccfce
* | Inter-emulator networking: add interfaces in the correct orderDries Harnie2010-06-091-5/+6
|/ | | | Change-Id: I9cab6f47bbde9f4dacdb2a426064af63eb4709c4
* qemu-props: Signal end of property list.Dries Harnie2010-06-071-0/+4
| | | | Change-Id: I0194413e3ce93ff09aa953f283a22211e93848a1
* Make the emulator build on Snow Leopard.Jeff Hamilton2010-06-032-19/+14
| | | | | | Force the minimum platform version to Leopard. Change-Id: Ibfff1ad611e1f262b81a324a16a3a28f80ae9a17
* Add small user-event abstraction interface.David 'Digit' Turner2010-05-2510-67/+117
| | | | | | | | | | | | | | | | Preparation for future UI frontend/backend separation. This is done to ensure that the code under android/skin/ does not depend on any QEMU-specific header. We achieve this by adding a new abstract header "user-events.h" and one QEMU-specific implementations for the functions defined here. This also modifies console.h and vl-android.c to make them closer to upstream (by removing Android-specific changes). + fix Makefile.android to always build SDL from sources in standalone mode. Change-Id: I0d152741e7bb2c9cd283f5c35bd054385c7c1eb3
* Fix regression: -netspeed <speed> and -netdelay <latency> didn't work.David 'Digit' Turner2010-05-252-0/+17
| | | | | | | The bug was introduced in a past integration patch that moved code from vl.c to net-android.c Change-Id: I5415c27959da396975b51bcf047399a9781ccd8a
* Fix Mac build by using prebuilt SDL library for OS XDavid 'Digit' Turner2010-05-201-0/+3
| | | | Change-Id: I60657e72b13f9425d642b6b5dd770ce4ecd66abd
* Build SDL from sources directly.David 'Digit' Turner2010-05-1815-332/+377
| | | | | | | | | | | | | | | | This removes the requirement to build the SDL library before the rest of the emulator. The prebuilt SDL library and installation is now optional and is only kept for the full Android build on Linux (mainly to avoid having to install many dev libraries on build servers). This patch affects both the Android and standalone build systems. The script android-configure.sh will not use a prebuilt SDL installation unless you explicitely use --sdl-config=<script>. Tested for linux-x86 / darwin-x86 / cygwin / linux-mingw builds. Change-Id: If973b2ad199f06aeeff43aec387d1ac629487529
* Merge "Enable interconnection of emulators"Jean-Baptiste Queru2010-05-174-0/+52
|\
| * Enable interconnection of emulatorsDries Harnie2010-05-184-0/+52
| | | | | | | | | | | | | | | | | | | | | | This patch adds a -shared-net-id option to the emulator which joins the emulator in a shared network. If the option is given the emulator is started with an additional network interface bound to a multicast socket. This multicast socket emulates a network hub, interconnecting emulators. If the -shared-net-id option is not given, nothing changes. Change-Id: I0ea70a073cdbd34f804161300240fafca34080d0
* | Disable audio support in our custom SDL build.David 'Digit' Turner2010-05-145-19/+8
|/ | | | | | This is not needed anymore. Change-Id: Id41b71c95566804b92185282bb51e317efc67255
* Moved android_emulation_setup from android/main.c to android/qemu-setup.cVladimir Chtchetkine2010-05-143-477/+515
| | | | Change-Id: Ic66bb0d07e28088ae02055c88d37bfd00edea592
* Fix Windows SDK build. It seems it defines ERROR as a macro somewhere.David 'Digit' Turner2010-05-111-0/+2
| | | | Change-Id: I35e1995add0faa00b336c4ef470a93b1c5de5a31
* Upstream: integrate minor cleanupsDavid 'Digit' Turner2010-05-1110-59/+147
| | | | Change-Id: I8de8e1044794f0ef8427717fc0b3b5e9e121247b
* Upstream: integrate timer/clock management changes.David 'Digit' Turner2010-05-1113-222/+343
| | | | Change-Id: I24acbdebe58d207352548f54dda1abf5be01e7d4
* Upstream: add qemu_fdatasync()David 'Digit' Turner2010-05-114-0/+27
| | | | Change-Id: I232b9c4df372e1fded97694fffcd72ef9ea113c4
* Upstream: integrate various misc. minor changesDavid 'Digit' Turner2010-05-1128-99/+209
| | | | Change-Id: I7d3eca1350f980d93f9f3198fa5250fb776de729
* Upstream: remove obsolete softfloat bitsDavid 'Digit' Turner2010-05-113-28/+0
| | | | Change-Id: If31cbe598bc7bd882800e25f90272f019d1ca9dc
* Upstream: Integrate TCG changes, remove obsolete sources for unsupported ↵David 'Digit' Turner2010-05-1118-7590/+401
| | | | | | targets. Change-Id: I2367d3ca13c1fb1dd8eaab734c7d3e826022b06a
* Upstream: HAVE_IOVEC => CONFIG_IOVECDavid 'Digit' Turner2010-05-115-6/+6
| | | | Change-Id: I18025d9c154a02af5d6298c7d7f72fc9f2c1c5d7
* Upstream: Misc integration - includes qobject.h and related sourcesDavid 'Digit' Turner2010-05-1159-341/+3733
| | | | Change-Id: Idfa93ab5c67c95a3bc1869eeaf3a84a75fe24cd6
* Moved QEmulator out of main.cVladimir Chtchetkine2010-05-114-335/+417
| | | | Change-Id: I20964bb5d7fbef5ea22d265427793a2a7fce2017
* Upstream: Move ioport code to ioport.[hc]David 'Digit' Turner2010-05-119-181/+392
| | | | Change-Id: I41aa30fff127338665a6a32fa66dcd43dd3bfe8b
* Fix build.David 'Digit' Turner2010-05-111-0/+1
| | | | Change-Id: I9c76b9cffd53c23b2c3c1bb90cfa3265b711ddb9
* Upstream: Replace sys-queue.h with qemu-queue.hDavid 'Digit' Turner2010-05-1036-508/+723
| | | | Change-Id: I5c51f54a7fe2ea702420429bbf0c789ed6d8c534
* Upstream: HOST_WORDS_ALIGNED -> WORDS_ALIGNEDDavid 'Digit' Turner2010-05-1024-42/+42
| | | | Change-Id: Ica9022695d83fb48a8c25fdb1e1f0dc1c63747ff
* Fix emulator OS X build when using the Android build system.David 'Digit' Turner2010-05-102-2/+2
| | | | Change-Id: Ia19b4e14b84c12edc040a70144a97b5ca9474b00
* Upstream: Use CONFIG_BSD instead of _BSD and HOST_BSDDavid 'Digit' Turner2010-05-1027-69/+206
| | | | | Also fix OS X build, which failed with a link error. Change-Id: Idd63f25dc1f46ea66da5727c7577def34f048c3c
* net_socket_receive_dgram: use socket_sendto instead of sendtoDries Harnie2010-05-071-2/+1
| | | | Change-Id: Icc4cf861961135ff66094e0de98471aef06ba442
* Separate audio stack and SDLVladimir Chtchetkine2010-05-045-669/+11
| | | | Change-Id: Ibf3d08172807bca7dc46d70bf51d5eadaed4372b
* When running from the Android build system and no skin is definedJeff Hamilton2010-04-271-3/+18
| | | | | | on the command line check for a skin in $ANDROID_PRODUCT_OUT/skin. Change-Id: I776aa481b38bd4e48982fdb5c032a10c970576a8
* merge from tools_r6The Android Open Source Project2010-04-270-0/+0
|\ | | | | | | Change-Id: I6ad57ad0cb13b1411a4811feef3657b2a66d130b
| * Changes to build Windows emulator under Linux/MinGWRaphael2010-04-233-5/+16
| | | | | | | | | | | | | | | | | | | | - Linux being case-sensitve, include "windows.h" instead of "Windows.h" is important. - Use MinGW's windres. - No pthread needed. (Merged from master Change Ib4ce944b) Change-Id: I29050b0013a6f9a3f1fd72e586a77c27d559b15a
* | merge from tools_r6The Android Open Source Project2010-04-1912-376/+45
|\ \ | |/ | | | | Change-Id: I860d4b338cba9ea749797d6607b262c8072dd1f6
| * Revert previous patch to fix SD Card emulationDavid 'Digit' Turner2010-04-1512-376/+45
| | | | | | | | | | | | | | | | | | | | | | The previous patch modifies SD Card hardware emulation in a way that is not backwards compatible with previous SDK platform releases. This has the unfortunate effect of making SD Card emulation not work properly when running existing AVDs. Reverting the patch until we get a better one. Change-Id: I82dac87709d88aa3bd292bf2ed0008ae74d95853
* | Changes to build Windows emulator under Linux/MinGWRaphael2010-04-143-5/+16
| | | | | | | | | | | | | | | | - Linux being case-sensitve, include "windows.h" instead of "Windows.h" is important. - Use MinGW's windres. - No pthread needed. Change-Id: Ib4ce944bb55a8b1d870e230f269c89cb7df0b3f2
* | merge from tools-r6The Android Open Source Project2010-04-085-132/+69
|\ \ | |/ | | | | Change-Id: I8b1287b619b6ec77024cb1ce56fabc80d2b1146d
| * Automatically parse a file named 'hardware.ini' if it is foundDavid 'Digit' Turner2010-04-061-0/+35
| | | | | | | | | | | | in the skin directory, and we are using the Android build system. Change-Id: I62480314f73ae60e769c113d6e4421e9946bb818
| * Revert change I7af83e21c64d217c6b28bf6cb5ee2e2f23182c95 to fix Froyo build.Vladimir Chtchetkine2010-04-023-131/+24
| | | | | | | | | | | | | | | | | | Apparently, that change that supposedly fixed AT-related ARMv7 bug broke DexOpt step in the build process, resulting in trashed files that crash the device. Rolling this change back to fix Froyo, until cause of the DexOpt breaking has been found and fixed Change-Id: I33b417fcbd65767f7cfe60f5fb5ffa32610b4852
| * Fix emulator changelogDavid 'Digit' Turner2010-03-311-1/+10
| | | | | | | | Change-Id: I77ddd628c7fea0b128623cecd336842673f07940
* | Merge "Making the port where adb is expected configurable."David Turner2010-03-301-2/+17
|\ \
| * | Making the port where adb is expected configurable.Stefan Hilzinger2010-03-311-2/+17
| | | | | | | | | | | | | | | | | | | | | Environment variable ANDROID_ADB_SERVER_PORT allows to control the port the emulator expects adb to be listening on. Change-Id: Ibe52c02829ac9a0308f2cf5da32a57ab773110f8
* | | Add documentation for framebuffer emulation.David 'Digit' Turner2010-03-301-0/+88
| |/ |/| | | | | Change-Id: I9f1ac21df0e6644533c4f35fe51e08ae7a979fb3