aboutsummaryrefslogtreecommitdiffstats
path: root/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | am f9c07534: Increase Emulator system image to 72MBXavier Ducrohet2009-09-302-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'f9c07534fd5c3cf54592db4771ac27df3a13522d' into eclair-plus-aosp * commit 'f9c07534fd5c3cf54592db4771ac27df3a13522d': Increase Emulator system image to 72MB
| * Increase Emulator system image to 72MBXavier Ducrohet2009-09-302-2/+2
| | | | | | | | | | | | | | This is required to run the SDK system image with the new assets in multiple densities. Change-Id: I4ab21a9c5ef554d1d8d63a32c3e88719e6d49253
* | am 2697a83b: Fix free() bug in charmap codevchtchetkine2009-09-251-0/+9
|\ \ | |/ | | | | | | | | | | Merge commit '2697a83bcf2b1d13c5f957e4c5ee64b774099b3f' into eclair-plus-aosp * commit '2697a83bcf2b1d13c5f957e4c5ee64b774099b3f': Fix free() bug in charmap code
| * Fix free() bug in charmap codevchtchetkine2009-09-251-0/+9
| |
* | am c3e6bb48: Fix emulator crash on exit, due to invalid free() call.David 'Digit' Turner2009-09-232-13/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'c3e6bb48bc36d7e1b95bff7c870b0842eb8a452e' into eclair-plus-aosp * commit 'c3e6bb48bc36d7e1b95bff7c870b0842eb8a452e': Fix emulator crash on exit, due to invalid free() call.
| * Fix emulator crash on exit, due to invalid free() call.David 'Digit' Turner2009-09-232-13/+1
| |
* | am 52195e70: Fix build break caused by undefined min(a,b)vchtchetkine2009-09-211-1/+4
|\ \ | |/ | | | | | | | | | | Merge commit '52195e705c10ab94c2b842591bbd2fda60e13102' into eclair-plus-aosp * commit '52195e705c10ab94c2b842591bbd2fda60e13102': Fix build break caused by undefined min(a,b)
| * Fix build break caused by undefined min(a,b)vchtchetkine2009-09-211-1/+4
| |
* | am 9085a28c: Implementation for dynamic charmap option in emulator.vchtchetkine2009-09-217-32/+696
|\ \ | |/ | | | | | | | | | | Merge commit '9085a28c14f369d231dbae099a690689179f428a' into eclair-plus-aosp * commit '9085a28c14f369d231dbae099a690689179f428a': Implementation for dynamic charmap option in emulator.
| * Implementation for dynamic charmap option in emulator.vchtchetkine2009-09-217-32/+696
| | | | | | | | | | Created .kcm parser and added -charmap option to the emulator, so user can specify keyboard layout for emulator session.
* | am 238b4b0e: Fix ARMv7 emulation by disabling CPU alignment exceptionsDavid 'Digit' Turner2009-09-201-2/+25
|\ \ | |/ | | | | | | | | | | Merge commit '238b4b0ef1a01afa66ef267dae4a96401ad386db' into eclair-plus-aosp * commit '238b4b0ef1a01afa66ef267dae4a96401ad386db': Fix ARMv7 emulation by disabling CPU alignment exceptions
| * Fix ARMv7 emulation by disabling CPU alignment exceptionsDavid 'Digit' Turner2009-09-201-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable alignment CPU exceptions to be able to boot an ARMv7 system image. This is because 4.4.0 emits a machine code sequence that stores an 8-bytes double on a 4-byte aligned address on the stack in the implementation of cvt() in the C library (see the disassembly for bionic/libc/stdio/vfprintf.c). It is uncertain that this is a compiler bug at this point, but the upstream QEMU sources don't have alignment exceptions enabled for any ARM target anyway. Also, add a check to force CPU emulation to "cortex-a8" if the kernel file name ends in "-armv7". This is a poor man's approach to hardware configuration that will be replaced by a more sophisticated solution in the future. Right now, we just want to be able to build -user system images with the dex preopt pass running in the emulator with the minimum amount of fuss.
* | am 06074941: Merge change 25638 into eclairDavid 'Digit' Turner2009-09-198-128/+180
|\ \ | |/ | | | | | | | | | | Merge commit '060749410208cd5a0e25faacdd6a5ef1ae8cf6d5' into eclair-plus-aosp * commit '060749410208cd5a0e25faacdd6a5ef1ae8cf6d5': Allow skins to provide a "dpad-rotation" field for each layout.
| * Allow skins to provide a "dpad-rotation" field for each layout.David 'Digit' Turner2009-09-198-128/+180
| | | | | | | | | | | | | | | | | | | | This is used to deal with the fact that the framework *always* assumes that the physical DPad is rotated in landscaped mode, while the default skin no longer does that. NOTE: tested on old skin files for backwards compatibility. (Upcoming skin fixes coming in another patch)
* | resolved conflicts for merge of 5d8f37ad to eclair-plus-aospJean-Baptiste Queru2009-09-159-25/+71
|\ \ | |/
| * Merge upstream QEMU 10.0.50 into the Android source tree.David 'Digit' Turner2009-09-149-25/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines.
* | merge from open-source masterJean-Baptiste Queru2009-09-153-2/+21
|\ \ | |/ |/|
| * Merge change 11469Android Code Review2009-09-141-0/+6
| |\ | | | | | | | | | | | | * changes: General changes to support freebsd system in building scripts
| | * General changes to support freebsd system in building scriptsAlexey Tarasov2009-09-081-0/+6
| | |
| * | Merge change 11471Android Code Review2009-09-141-2/+2
| |\ \ | | | | | | | | | | | | | | | | * changes: Allowed building on FreeBSD same timezone related code as for Linux.
| | * | Allowed building on FreeBSD same timezone related code as for Linux.Alexey Tarasov2009-09-081-2/+2
| | |/
| * | Added config file related to FreeBSD-x86Alexey Tarasov2009-09-081-0/+13
| |/
| * merge from donutJean-Baptiste Queru2009-09-031-3/+3
| |\
| * \ merge from donutJean-Baptiste Queru2009-08-036-89/+444
| |\ \
| * \ \ Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-2523-569/+1265
| |\ \ \
| * \ \ \ Merge commit 'korg/donut'The Android Open Source Project2009-04-244-92/+249
| |\ \ \ \
| | * | | | AI 146314: modify GSM emulation to accomodate 1.0 and 1.1 system images.David Turner2009-04-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without this, networking doesn't work well when using the 1.1 add-on with the cupcake sdk BUG=1787254 Automated import of CL 146314
| | * | | | AI 145806: Add qemud-version auto-detection logic to android/hw-qemud.cDavid Turner2009-04-123-91/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the supported QEMUD services in known Android systems Print "Press F6 to exit trackball mode..." in the window title bar when one activates the persistent trackball mode. The actual text depends on your key binding configuration. Refine the skin directory auto-search paths when an AVD name is not given on the command line. This makes the following work correctly: tools/emulator -sysdir platforms/android-1.5/images -data foo.img BUG=1745505 Automated import of CL 145806
| | * | | | AI 145805: Fix a bug in android/console.c that prevented the console "redir ↵David Turner2009-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add" command from working properly Fix a bug in sock_address_init_resolve which caused a crashed when getaddrinfo() returned an error. BUG=1769061,1780001 Automated import of CL 145805
| * | | | | Merge commit 'korg/cupcake'The Android Open Source Project2009-04-143-48/+68
| |\ \ \ \ \ | | |/ / / /
| | * | | | AI 144595: Fix the AVD configuration code to support "sdcard.path" in ↵David Turner2009-04-053-48/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.ini to indicate an explicit SD Card image file (instead of using the one in the content directory) Note that this also fix a bug where the SD Card image was not properly locked in the previous implementation. Allow the http-proxy support code to actually manage to receive chunked encoding data, instead of complaining needlessly. Introduce a new CharBuffer object that is used indirectly by "-radio <hostdevice>" and "-gps <hostdevice>" options Add new documentation for QEMUD and CharDriverState objects Update the Audio documentation with ASCII graphics (because I'm an artist too) BUG=1750126,1731936 Automated import of CL 144595
| * | | | | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-2714-599/+1827
| |\ \ \ \ \ | | |/ / / /
| | * | | | Automated import from //branches/cupcake/...@142901,142901David Turner2009-03-261-0/+1
| | | | | |
| | * | | | Automated import from //branches/cupcake/...@142527,142527David Turner2009-03-254-32/+33
| | | | | |
| * | | | | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1790-766/+32383
| |\ \ \ \ \
| * | | | | | Fixing emulator crash on Win32.Adrian Taylor2009-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when starting the emulator on Win32 after it has been built using 'make_windows_sdk.sh' and when the ANDROID_PRODUCT_OUT variable is not defined. The bug is discussed at http://code.google.com/p/android/issues/detail?id=1999 and the fix is proposed by David Turner at http://groups.google.com/group/android-platform/browse_thread/thread/91b12cc73aae98ae This patch just includes the proposed fix. I have confirmed it fixes the problem for me. The same code built as a Linux emulator also continues to work. I have been unable to test on Darwin as I don't have a handy OS X machine.
* | | | | | | Added two new hardware properties to control AVD partition sizes.David 'Digit' Turner2009-08-285-21/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disk.systemPartition.size (default 66MB) disk.dataPartition.size (default 66MB) If the emulator detects that an image file is larger than the corresponding setting, it will do the following: - for AVDs running from the SDK, an error message will be printed and the emulator aborts. Note that this can only happen if there are some serious mis-configuration of AVDs anyway. - when launching the emulator from the Android build system, a warning will be printed, and the partition size will be automatically adjusted at launch. Previously, trying to launch an over-sized system image would result in the emulated system booting, but then failing to find certain files, depending on how the yaffs2 disk images are built. This caused hard-to-debug issues. Note that the option -partition-size <size> can be used to override the AVD's setting at runtime.
* | | | | | | Fix F2/PageUp to properly generate an emulated Menu key press.David 'Digit' Turner2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced by previous changes to hw/goldfish_events_device.c where the list of valid key scancodes reported by the kernel was restricted to KEY_SOFT1 but not KEY_MENU. KEY_SOFT1 is the scan-code used to represent a press of the Menu key on the emulated device. KEY_MENU is some Linux thing that is confusingly unrelated. Before we filtered out KEY_MENU, the framework or keymap was capable of transforming KEY_MENU into the proper kKeyCodeMenu at runtime. But the event filtering added in goldfish_events_device.c meant that KEY_MENU was never passed by the kernel to user-space. The fix is simply to generate KEY_SOFT1 for emulated Menu key presses.
* | | | | | | Fix EsounD audio backend and bump version number.David 'Digit' Turner2009-08-212-13/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original esdaudio.c file from upstream contains a nasty race condition that can be triggered when the emulator exists while the audio record thread is in a blocking read() call. In this case, exit() will end up calling esd_fini_in which will try to pthread_join() the blocked thread, resulting in a dead-lock. This change just gets rid of the helper threads and just performs audio output and input in the main event loop, avoiding blocking i/o completely. I haven't experienced any difference compared to the original one, be it in audio lag or CPU usage when playing a simple MP3 file in the emulated system. The change also updates the update-audio.sh script since we don't store our sources in p4 anymore. A small fix in common.sh deals removes an obsolete special case that is not needed anymore when determining the location of the host prebuilt binaries. The version number is also bumped to 1.12 and CHANGES.TXT updated accordingly.
* | | | | | Shorten the title of the emulator to only contain very relevant info.Xavier Ducrohet2009-08-111-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | BUG: 2044596
* | | | | Add KEY_XXX values to console "event send EV_KEY:<name>:<value>"David 'Digit' Turner2009-07-302-82/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also modifies hw-events.c because EV_KEY has both BTN_XXX and KEY_YYY labels that must be accounted for in the list.
* | | | | Fix ANDROID_SDK_HOME handling on Unix (the env. var was ignored)David 'Digit' Turner2009-07-244-7/+14
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version number to 1.11 in android/android.h Update CHANGES.TXT to reflect SDK 1.5_r3 changes Update some comments in android/boot-properties.[hc] Add a --debug option to android-configure.sh (and android-rebuild.sh) to build a unoptimized debug version of the standalone emulator binary.
* | | | Add a new hw.lcd.density hardware property to AVD configuration files.David 'Digit' Turner2009-06-195-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This value can be overriden with the already existing -dpi-device <value> option. The value is mapped to one of 120,160 and 240, then set to the boot-time property named qemu.sf.lcd_density used by the framework to properly select assets and/or resize them at runtime. This means that "emulator -dpi-device 130" will select 120 lcd_density, or "emulator -dpi-device 220" will select a 240 one.
* | | | This fixes the hardware emulation to support several clients listeningDavid 'Digit' Turner2009-06-121-153/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the "sensors" service at the same time. Each client can decide to listen to different sensors, with different delays too. The previous implementation only allowed a single client, which blocked anything application that tried to read the sensors (since the framework was already the only allowed client) Signed-off-by: David 'Digit' Turner <digit@google.com>
* | | | Add our modified SDL sources under distrib/sdl-1.2.12David 'Digit' Turner2009-06-087-396/+545
| | | | | | | | | | | | | | | | | | | | | | | | Fix distrib/make-distrib.sh script to work with git Fix distrib/build-emulator.sh to accomodate for new SDL configure script Handle Tiger SDK usage in SDL configure script
* | | | Bump version number and update ChangeLogDavid 'Digit' Turner2009-06-011-1/+1
| | | |
* | | | Allow emulator skins to provide a button for the "search" hardware scan-code.David 'Digit' Turner2009-05-261-0/+1
| | | | | | | | | | | | | | | | This is different from using the F5 default key-binding that generates the same thing.
* | | | This adds the '-prop <name>=<value>' option which is used to setDavid 'Digit' Turner2009-05-2611-20/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot-time system properties from the command line. This is done by implementing a new 'boot-properties' qemud service in the emulator. This is to be used by the 'qemu-props' helper program that will be invoked by /system/etc/init.goldfish.rc to read a list of system properties from the emulator and set them in the emulated system during boot.
* | | | AI 146315: am: CL 146314 modify GSM emulation to accomodate 1.0 and 1.1 ↵David Turner2009-04-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system images. without this, networking doesn't work well when using the 1.1 add-on with the cupcake sdk Original author: digit Merged from: //branches/cupcake/... Automated import of CL 146315
* | | | AI 145976: am: CL 145806 Add qemud-version auto-detection logic to ↵David Turner2009-04-133-91/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android/hw-qemud.c Document the supported QEMUD services in known Android systems Print "Press F6 to exit trackball mode..." in the window title bar when one activates the persistent trackball mode. The actual text depends on your key binding configuration. Refine the skin directory auto-search paths when an AVD name is not given on the command line. This makes the following work correctly: tools/emulator -sysdir platforms/android-1.5/images -data foo.img Original author: digit Merged from: //branches/cupcake/... Automated import of CL 145976
generated by cgit v1.1 at 2025-09-14 15:40:22 +0000