aboutsummaryrefslogtreecommitdiffstats
path: root/android
Commit message (Collapse)AuthorAgeFilesLines
* Remove CONFIG_ANDROID_SNAPSHOTS macro.David 'Digit' Turner2011-03-0110-58/+6
| | | | | | The feature is no longer optional. Change-Id: I4558f12e3804e42069e8a3e6bcf0837d350206ed
* 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
* Remove un-needed -clock unix core option.David 'Digit' Turner2011-03-011-9/+0
| | | | | | | | | | | | 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
* 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
* Quote concatenated QEMU options when -verbose is used.David 'Digit' Turner2011-03-011-1/+8
| | | | 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
* | Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-244-15/+19
|/ | | | | | | | | | | | This patch modifies the way we build the emulator's various programs. It reduces the number of static libraries generated, and better segregates between common, ui, qemu and target-specific code. Note that we build both the arm and x86 binaries at the same time in all build scenarios for now. This is done to catch build regressions as soon as possible. Change-Id: I6240705041e137e32f207e1e2444c614c52aaf05
* Remove android/main-ui.cDavid 'Digit' Turner2011-02-234-1106/+269
| | | | | | | | | | | | The differences between android/main.c and android/main-ui.c are now minimal, so remove the latter source file by moving the corresponding code into android/main-common.c Also add a -snapshot-no-time-update core option to implement the emulator-ui -no-snapshot-update-time option. We're probably going to clean this up a little in the future, but this is enough for now. Change-Id: I868bb4e47c3d106ae7436ee3f5b2c0ff5fb6ea5c
* Remove target-specific hard-coded macro.David 'Digit' Turner2011-02-231-8/+74
| | | | | | | | | | | | | | | This removes the hard-coding of the prebuilt architecture path in android/avd/info.c, in order to build a single version of this source that can work with any supported architectures. NOTE: The target architeture is only useful in the case of the Android build system. We check the target arch by parsing $ANDROID_PRODUCT_OUT/system/build.prop and look for a line that looks like: ro.product.cpu.abi=<abi> Change-Id: I4e573343fa532e66eb034c895a5759754f2d1aef
* Minor cleanups for core/ui Makefile separation.David 'Digit' Turner2011-02-233-4/+10
| | | | | | | | | | | | | | | | This patch contains minor cleanups that will be needed by a few future patches that will improve the way core and ui sources are separated and built. - remove a few compiler warnings - formatting - remove the memcheck CONFIG_MEMCHECK checks (they later get in the way) - refine hw/hw.h inclusion's of cpu.h (this comes from upstream) - add missing definitions for PRUd64 and PRUx64 (used later) - remove CONFIG_SHAPER test, replace with CONFIG_ANDROID instead. - add missing strdup() calls. Change-Id: Ic7d6681a51af718c298f0ee4bd884b1d8750f28e
* Stuff hardware configuration with paths to image / partition filesVladimir Chtchetkine2011-02-226-892/+705
| | | | Change-Id: Id26cd578fc3faf1fee1a55f4999c3613e47c0e96
* Fixing the standalone build of the emulator.Stefan Hilzinger2011-02-221-1/+1
| | | | Change-Id: I81567b512df04314d87dd3846b02d8895829937d
* Enabled the camera button in the emulatorsoledad penades2011-02-191-0/+1
| | | | Change-Id: I1587d5e6ccc0bf092bb38b2c841eb19cb006f2e7
* merge from tools_r10The Android Open Source Project2011-02-172-0/+6
|\ | | | | | | Change-Id: I8730ebf34c07bf1a5167970ee1fdce4fb3094c54
| * Merge 59e8e196 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-167-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | Add hw.keyboard.lid This is used to control the lid switch virtual device. + Add support for a "version <number>" field to the skin format. This will later be used for skin format #3. + Fix a bug where string hw properties didn't work/compile Change-Id: I27ff3293b439917a51c584a25139264ddb1aff12
| * Fix "avd name" bug.David 'Digit' Turner2011-02-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The console's 'avd name' command returned "unknown" incorrectly. This was due to a missing option when invoking the core, even in the standalone case. Fixes bug 3454261 Change-Id: I7efcfc50792231f57dc76d3c11e7968faf057e12 NOTE: This is a quick fix for tools_r10. A proper fix should instead move the AVD name to auto-generated qemu-hardware.ini instead of using a core command-line option.
| * Merge 593d0ea0 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-151-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | hw-sensors.c: Reduce default delay between sensor updates. This reduces the default delay used between sensor updates. This is needed to fix orientation for Honeycomb emulation since the framework's window orientation listener now discards events if they are spaced by more than 1 second (which happened to be the old default). Change-Id: I4a29bc6f905ca048aa8b753130a7a1711c3a79f3
* | hw-sensors.c: Reduce default delay between sensor updates.David 'Digit' Turner2011-02-151-5/+7
| | | | | | | | | | | | | | | | | | | | This reduces the default delay used between sensor updates. This is needed to fix orientation for Honeycomb emulation since the framework's window orientation listener now discards events if they are spaced by more than 1 second (which happened to be the old default). Change-Id: I9194d93ab445302df1d887473b6ff5c446e13f98
* | Add hw.keyboard.lidDavid 'Digit' Turner2011-02-107-17/+47
| | | | | | | | | | | | | | | | | | | | | | This is used to control the lid switch virtual device. + Add support for a "version <number>" field to the skin format. This will later be used for skin format #3. + Fix a bug where string hw properties didn't work/compile Change-Id: I678a0988d2cd24169dd0c2ece96e7ab0b2822104
* | Correct auto-detection of default VM heap size.David 'Digit' Turner2011-02-107-51/+59
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Get rid of -android-gui core option.David 'Digit' Turner2011-02-106-2/+90
| | | | | | | | | | | | | | | | | | Instead, pass all LCD configuration in qemu-hardware.ini. + Make the latter file mandatory to launch a core. You can easily generate one by launching "emulator <options>" though. Change-Id: I81a1938217562517e4c2bbb828aef934033c29a5
* | Write the core hardware configuration file to AVD's content directory.David 'Digit' Turner2011-02-104-39/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not write the core's hardware configuration file to a temporary file. Instead, stored it under the AVD's content directory with the name qemu-hardware.ini. For platform builds, use $ANDROID_PRODUCT_OUT/qemu-hardware.ini The purpose of this auto-generated file is to contain all hardware configuration required to properly launch a core from the UI. Further patches will get rid of special core command-line options (e.g. -android-gui) and rely on the content of this file, by adding new hw properties. Change-Id: Id761151c8c8990f1cfa7380779b720080f49469f
* | Revert "Build arm and x86 binaries at the same time."Xavier Ducrohet2011-02-0911-106/+37
| | | | | | | | | | | | This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
* | Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-1011-37/+106
|/ | | | Change-Id: I105c5a097c988cb964b47b40b71c7a08af0d9210
* Rename emulator_config_xxx to user_config_xxxDavid 'Digit' Turner2011-02-094-10/+10
| | | | Change-Id: Icfcef72a02e388f2aa87b97f004ed43715fc9f30
* Merge "emulator: Fix -no-window flag"David 'Digit' Turner2011-02-091-0/+2
|\
| * emulator: Fix -no-window flagDavid 'Digit' Turner2011-02-091-0/+2
| | | | | | | | Change-Id: Ibb06b7d412faeafa717de6d095a9eaae84d35ab4
* | Merge "android-configure.sh: Fix --cc=<compiler> option."David 'Digit' Turner2011-02-095-8/+36
|\ \ | |/
| * android-configure.sh: Fix --cc=<compiler> option.David 'Digit' Turner2011-02-095-8/+36
| | | | | | | | | | | | | | | | + Fix LOCAL_GENERATED_SOURCES handling + Fix missing library dependencies for executables + Move generated library files to objs/libs/ (instead of objs/) Change-Id: If3ebaa7ae856efa9bd3ff9e2c199389989db7f71
* | Fixing aborts caused by compute_fb_update_rect_linear() when the framebuffersJun Nakajima2011-02-081-0/+1
|/ | | | | | | | are large. Also, added a boot parameter for the goldfish kernel to use PIT, rather than TSC. Change-Id: I5824c7248e0c1a4c487aeb52da112d870846ae62 Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* Fix emulator core and UI on WindowsVladimir Chtchetkine2011-02-075-10/+16
| | | | | | | | There are two parts in this CL: 1. Fixing the Windows build (missing set_fd_handler) 2. Replacing read/write with socket_recv/socket_send. Change-Id: I5fa599774260257d481b738a892e1124135fc319
* x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.Jun Nakajima2011-02-025-5/+34
| | | | | | | Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb 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>
* Formatting / Code styling.David 'Digit' Turner2011-02-023-81/+87
| | | | | | | Rename implFb_xxx to fbUpdatesImpl_xxx for consistency Avoid redundant global variable access Change-Id: I783b52ade3ff3e9f04f34162684eeb9c4c4addac
* Remove QEMU-ism from UI code.David 'Digit' Turner2011-02-024-26/+28
| | | | | | | | | This gets rid of qemu_set_fd_handler() users in the UI program. We can remove its implementation from vl-android-ui.c + Really remove qemu-timer-ui.c :-) Change-Id: I490df8ad5d5eea36b332bf54e2b156f6b5872bf4
* Simplify UI-only sources.David 'Digit' Turner2011-02-027-16/+27
| | | | | | | | | | Get rid of console-ui.c, qemu-timer-ui.c and modify vl-android-ui.c to use a generic Looper object instead of a crummy event loop. We still need to implement qemu_set_fd_handler for two sources under android/protocol/ but this will be cleaned up later. Change-Id: Icd0762675ca2f54e720a9cec40f96caea500b52f
* Simplify core framebuffer management.David 'Digit' Turner2011-02-025-205/+82
| | | | | | | | | | | | | | | | | | | | | | | Remove one layer of indirection between the core's DisplayState and a ProxyFramebuffer object. The main ideas behind this patch are that: - We don't need a QFrameBuffer object when in the core process, each proxy can receive display updates directly from QEMU. - The DisplayChangeListener is really lame: its can't dissociate between several listeners that use the same callback pointers, so introduce DisplayUpdateListener in console.h to work around this. This is preferably to modifying DisplayChangeListener which is going to introduce conflicts with upstream. - Simplify a lot the console code and display-core. Note that we can have several framebuffer clients at the same time now. Note that QFrameBuffer is still used by both the UI program and the standalone emulator. Change-Id: I6d5ad6ecd9b34b9d9d1a30ea5000e875c285e84e
* Move framebuffer.h to android/David 'Digit' Turner2011-02-0210-8/+520
| | | | | | | The QFrameBuffer is no used by QEMU-specific code anymore so it's more logical to move it here. Change-Id: Id49ff53dd49648000e7543652d66f7c03881a8cb
* Move core-connection.c from to android/protocol/David 'Digit' Turner2011-02-029-7/+7
| | | | Change-Id: I1f04ed1f00fccdea043f4a4fbf5ba745b36bbcc7
* Separate init_skinned_ui() into two functions.David 'Digit' Turner2011-02-026-214/+227
| | | | | | | | | | | | | | | This removes init_skinned_ui() and adds parse_skin_files() and init_sdl_ui(). The first function only parses skin files and options, and doesn't do anything related to the UI. The second function does setup the SDL UI after all options/skin processing has been performed. We also modify main.c and main-ui.c to move the call to init_sdl_ui() as far as possible after the options parsing. + Move core attachment code to the end of qemu_main() in main-ui.c Change-Id: I2bf5f0a096d827ae1fee070a8fa45cbd4629d54f
* Move common main routines from into android-common.[hc]David 'Digit' Turner2011-02-024-938/+580
| | | | | | This is a first step towards cleaning-up our initialization/startup code. Change-Id: I2d4fbc5c2cd0181fb39a1a97a15650945038c3b9
* Merge "Create user data image using the initial user data image"David Turner2011-02-011-1/+0
|\
| * Create user data image using the initial user data imageOrjan Percy2011-01-281-1/+0
| | | | | | | | | | | | | | | | | | | | Starting the emulator with a new AVD should create a new user data image (userdata-qemu.img) as a copy of existing user data image (userdata.img). This is not done since the flag IMAGE_EMPTY_IF_MISSING will cause the user data image to be reset. By not setting the flag the user data is initialized in the way documented in code and on-line help. Change-Id: I787bcbc904f79edf241fbacb7446f459fc5f2ad0
* | Generate temporary hardware.ini from configuration settings.David 'Digit' Turner2011-02-017-41/+213
| | | | | | | | | | | | | | | | | | This patch generates a temporary hardware.ini from the hardware configuration. The idea is to move as much hw config info as possible to a single file that the core can read. Other patches will change how various config info is passed to the core, from command-line options to the generated hardware.ini.
* | Refactor attach-UI serviceVladimir Chtchetkine2011-01-3113-128/+375
| | | | | | | | Change-Id: Ia68ceb57ee5b5a66fa76b837fe3b990eb12e7188
* | Refactor the framebuffer serviceVladimir Chtchetkine2011-01-319-227/+200
| | | | | | | | Change-Id: I8ac4580af65b8d58976c97b77b309dd202e75003
* | Refactored user-events protocolVladimir Chtchetkine2011-01-2810-241/+472
| | | | | | | | Change-Id: I08afb96ef17a52c3795f5029acfc244a93ab57c7
* | Refactored ui-core-control and core-ui-control protocolsVladimir Chtchetkine2011-01-2832-1813/+2020
|/ | | | | | | Also cleaned the code up from obsolete ui-core-protocol.* and core-ui-protocol.* Change-Id: I194bec669d25b68a10c32b2be50bc9da50c52ebb
* Remove spaces in the console service namesVladimir Chtchetkine2011-01-266-15/+15
| | | | Change-Id: I339449214ab951aba40abfe2a5b3e3ebfb222311
* Merge "Implement UI control service and client"Vladimir Chtchetkine2011-01-2613-92/+1631
|\