aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
Commit message (Collapse)AuthorAgeFilesLines
* [MIPS] Enable OpenGL emulation for MIPSBhanu Chetlapalli2012-06-011-1/+1
| | | | | Change-Id: Ib39de7ccf512a81436e68ac1363010af3cb2d28a Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* Implement the EGL_KHR_fence_sync extensionJesse Hall2012-05-303-18/+61
| | | | | Bug: 6515813 Change-Id: I738fc2663d81876dc75ad560fd08506b423a21bf
* Merge "Allow frame callback to be enabled/disabled"Jesse Hall2012-05-105-57/+84
|\
| * Allow frame callback to be enabled/disabledJesse Hall2012-05-105-57/+84
| | | | | | | | | | | | | | | | Since per-frame readback is slow and clients don't need it on all the time, this change allows the callback to be registered after initialization, and allows it to be disabled later. Change-Id: Ic73d4515d302a0981ee0c80b9e6f9ba5c84b82ae
* | Explicitly include -X11 while building emulator_rendererBhanu Chetlapalli2012-05-101-1/+1
|/ | | | | | | | | | | | | | | | emulator_renderer implicitly uses symbols defined by libX11.so through intermediate libraries, which can cause dependency issues if the intermediates drop the dependency. The linkers on distros like fedora now explicilty disable such indirect dependency resolution - which causes compilation failure. More information is available at this URL http://fedoraproject.org/wiki/UnderstandingDSOLinkChange Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com> Change-Id: If378fa76142cb6c8c7641d76802dcbc7691871d6
* Use the same compilation options on OS X 10.8 as 10.7Al Sutton2012-05-072-4/+4
| | | | | | | | Added OS X 10.8 to the conditional which includes dylib during compilation on 10.7. Change-Id: Id078e001fd52d82b345249fcf647e0a4802c1f89 Signed-off-by: Al Sutton <al@funkyandroid.com>
* Export GL strings through render_apiJesse Hall2012-05-0110-28/+104
| | | | | | | | | This also changes the strings reported by the default OpenGL ES 1.1/2.0 to OpenGL translators so they include the strings from the underlying OpenGL implementation. This will give more useful bug reports and SDK deployment statistics. Change-Id: Id2d231a4fe3c40157c24a63ec19785826e037fd3
* Merge "Publish and use libOpenglRender interface header"Jesse Hall2012-04-252-77/+85
|\
| * Publish and use libOpenglRender interface headerJesse Hall2012-04-182-77/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator opengles.c file duplicated the function declarations from libOpenglRenderer's render_api.h instead of including it directly. This led to multiple bugs since the declarations didn't actually match, but there was no way for the compiler or dynamic loader to check this. This change makes opengles.c include render_api.h to get function pointer prototypes, and changes the prototypes/implementation as necessary to make both sides actually match. It should be much more difficult to introduce interface mismatch bugs now. Two bugs this change would have prevented: (a) The interface mismatch caused by inconsistent branching which led to GPU acceleration crashing on Windows. With this change, we would have caught the problem at compile time. (b) The emulator verbose log has always been printing "Can't start OpenGLES renderer?" even when the renderer started fine. This is because the renderer was returning a bool (true == success) but the emulator's declaration said it returned int, and the emulator assumed 0 meant success. This difference in return type should now be caught at compile time. Change-Id: Iab3b6960e221edd135b515a166cf991b62bb60c9
* | Add support for RAW_SENSOR pixel format to emulator gralloc.Eino-Ville Talvala2012-04-181-13/+29
|/ | | | Change-Id: I45e3eb12187c10b9d5625fa2521573dc9348417a
* Move emulator GLES from development.git to sdk.gitJesse Hall2012-04-16314-0/+56684
| | | | | | | | | | | | | | | The emulator GLES support has two interfaces: a host shared library interface used by QEMU, and a protocol between the platform and the host. The host library interface is not versioned; QEMU and the GLES renderer must match. The protocol on the other hand must be backwards compatible: a new GLES renderer must support an older platform image. Thus for branching purposes it makes more sense to put the GLES renderer in sdk.git, which is branched along with qemu.git for SDK releases. Platform images will be built against the protocol version in the platform branch of sdk.git. Change-Id: I2c3bce627ecfd0a4b3e688d1839fe10755a21e58
* remove HAL_MODULE_INFO_SYM constNick Kralevich2012-03-012-2/+2
| | | | | | | | | | HAL_MODULE_INFO_SYM was declared as read-only, but the struct is written to by libhardware. This causes a segfault when -Wl,-z,relro is enabled. Fixed. Change-Id: I5324418b217abbfe95e7b39825d52cc8d6e26732
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-082-8/+8
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I3543198b483c91a3bf7c3f17e174969af3dfb8c5
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-051-1/+1
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ic2929fa9e6d15ce1710fc960c7570ee11cc7b0f6
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-033-4/+4
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I9736fcbb62da749c049178b03ddaccda30dcebf5
* Fix magnetic field sensor string.Adam Zalcman2011-07-171-2/+2
| | | | | | | | The emulator's sensor module sends "magnetic-field:<x>:<y>:<z>" rather than "magnetic:<x>:<y>:<z>", see external/qemu/android/hw-sensors.c. Change-Id: I858f4f88a4af47504bbf204340db238cf2ac2d66 Signed-off-by: Adam Zalcman <viathor@google.com>
* emulator: qemud: shut-up debug messages.David 'Digit' Turner2011-05-021-1/+1
| | | | | | | | | This change is already under development/tools/emulator/system/qemud/qemud.c However, this sdk/.../qemud.c source file was first deleted, then reverted, with the change in between. So apply it here too. Change-Id: Ib79e0e7260c392fb886b39ff5494837e045cdf1a
* Revert 183675b74e5a58211e5d9a90a9ca86546ed3e245David 'Digit' Turner2011-04-1410-0/+3689
| | | | | | | | | | | | | | | | Unfortunately, we need to keep the duplicate libraries here to prevent breaking a few internal branches for now. Remove obsolete emulator modules The corresponding modules have all been moved to development/tools/emulator/system/ already. Note that we use a global variable Make trick to prevent the same module from being built twice, so removing these files doesn't break the builds. Another patch should remove the global variable Make trick from development/tools/emulator/system after this patch. Change-Id: I97332216b311608de61919cb75f4b760b249c0d9
* Remove obsolete emulator modulesDavid 'Digit' Turner2011-04-078-3559/+0
| | | | | | | | | | | The corresponding modules have all been moved to development/tools/emulator/system/ already. Note that we use a global variable Make trick to prevent the same module from being built twice, so removing these files doesn't break the builds. Another patch should remove the global variable Make trick from development/tools/emulator/system after this patch. Change-Id: I547d2a0173ddf58c1870784920ce795f6a0d7bcf
* Merge "Removing emulator/opengl from the sdk.git"David Turner2011-03-1614-2145/+0
|\
| * Removing emulator/opengl from the sdk.gitJacky Romano2011-03-1614-2145/+0
| | | | | | | | | | | | This project code is moving to live under development.git/tools/emulator Change-Id: I3f7673bc17681a0ffa14bb0b4d0880977b77f24d
* | Prepare for moving platform-specific emulator modules to development.gitDavid 'Digit' Turner2011-03-114-0/+35
|/ | | | | | | | | | | | | We need to move the platform-specific modules to development.git to avoid some clashes. This patch uses a guard Make variable to ensure that each module is only built once. The plan is to simply copy these modules to development.git, then remove the current ones from sdk.git. The guard variable is here to ensure that the transition happens smoothly, i.e. if a build contains modules in both directories, only one of them will be built. Change-Id: I4bc58741a18488f18a4b17e8a1edc4a4a5a93cbc
* Merge "Emugen : A tool to generate wire protocol code"David Turner2011-02-2514-0/+2145
|\
| * Emugen : A tool to generate wire protocol codeJacky Romano2011-02-2514-0/+2145
| | | | | | | | | | | | | | | | | | | | | | Emugen is a tool that can be used to generate code that deals with marshaling/unmarshaling request to/from a wire-protocol. Its input is an API defintion files and its output is C++ source code for the client (caller) and the server (callee) sides. See README file for more details. Change-Id: I45beea6657fae0887d2b4d92933213ecc20d2525
* | Adjust AVD create dialog to match sdcard size limits.Raphael Moll2011-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | Change mksdcard to a minimum of 9 MiB, which is what we enforce in the UI (I believe the 8 MiB min was obsoleted by the 9 MiB one.) Also warn the user about the min/max sdcard size properly directly in the creation dialog, instead of relying on mksdcard to fail later. Change-Id: I30bc425ed6b75d8a00965e9e2e25890bd9bd8b39
* | Mksdcard: Sanity check size, better error messages.Raphael Moll2011-02-171-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: - Issue 13277: mksdcard fails to create insanely large sdcard. - Issue 14429: better error message when disk full. Details: - Actually report fopen/fwrite errors (instead of silently failing.) This alone fixes the 2 reported issues. - Check size argument parsed correctly and isn't larger than the FAT format can handle. - Actually indicate in the usage text the min/max size values. - Added support for a 'G' postfix, to make gigabyte sdcards. Change-Id: I4986c2c7c031f3b9bfd580b015b56d741aba778f
* | Fix emulator GPS supportMike Lockwood2011-02-151-10/+10
| | | | | | | | | | | | | | | | | | | | Use create_thread_cb instead of pthread_create to create gps_state_thread so it can safely call into the Java framework. BUG: 3375089 Change-Id: Ie7b2bd4bea519702d4238ba375bf83b059095b9e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Update the sensor emulation to use the new HALBertil Lynner2011-02-101-96/+111
|/ | | | | | | The sensor HAL in libhardware was recently updated, this change updates the sensor emulation to match the new HAL. Change-Id: I1cf60665ec3cc59a14859de487a65b399ff9e343
* Move keymaps to frameworks/base/data/keyboards.Jeff Brown2011-01-255-261/+0
| | | | Change-Id: I787601e3ab3ac4ce3d5ef5691788af62abbf91e9
* Merge "Add handling of proximity sensor"David Turner2011-01-181-2/+23
|\
| * Add handling of proximity sensorOla Albertsson2010-12-171-2/+23
| | | | | | | | | | | | | | A proximity sensor is added to the sensors, the proximity sensor has resolution 1 and maxRange 1. This means that it can be either 0 or 1. Change-Id: I60e27ebe673d493124be19158e56a19b0e4813de
* | Add snapshot handling for AVD creation, details, and launchTim Baverstock2011-01-121-0/+0
| | | | | | | | | | | | Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'. Change-Id: I5bc94c316e550b2585ca80185a02ffbe6d3e8401
* | Remove skins from sdk.gitXavier Ducrohet2011-01-0798-3092/+0
| | | | | | | | | | | | They are now in development.git Change-Id: I9b8ec2c65892cb7635b6be77a7c8929f62d018b8
* | merge from open-source masterThe Android Open Source Project2010-11-181-0/+4
|\ \ | |/ | | | | Change-Id: Idf12fbcb5508ca53047fcde3c35a96f9a971d305
| * Merge "Fixed a problem that physical address is inconsistent."David Turner2010-11-181-0/+4
| |\
| | * Fixed a problem that physical address is inconsistent.Mori, Yoshio X2010-09-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When epoll_wait detected a state change of fd, an events structure including pointer appointed in epoll_ctl is returned by epoll_wait. The data of each returned structure will contain the same data the user set with a epoll_ctl(2) (EPOLL_CTL_ADD,EPOLL_CTL_MOD) while the events member will contain the returned event bit field. When older hook and epoll_event are deleted after hook and epoll_event are added newly, this problem occur. So, when hook is closed, rewrite physical address of epoll_event which is pointing hook. Change-Id: I90f01ba5fbf307b3483da67d993cb874ba56d155
* | | merge from open-source masterThe Android Open Source Project2010-10-121-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I577a12b8961cd28dcb3238a1e484c689c0d578e7
| * | Volume keys need to be wake keys in order for them to work when the screen ↵Joe Onorato2010-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | is off. Bug: 3083496 Change-Id: I9b456cf002a8a9d953d631c163054f8ccc9572fa
| * | Revert "Fixed problem with keymap files copied to target"Jean-Baptiste Queru2010-09-014-0/+248
| | | | | | | | | | | | This reverts commit 1fc95cae8ec2ccfe134ff279ed9082311ad0d877.
| * | Fixed problem with keymap files copied to targetMagnus Karlsson2010-08-314-248/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps to build/target/board/generic. This causes the keymap files to copied into the system image of generic and sdk products, but not into the system image of HW products. Originally the qwerty.kl was copied to target no matter if the target had a qwerty keyboard or not, which is the case for e.g. the Nexus One. Change-Id: I6f76bcd4e23b8478f36f213090d22d7d3ea1255b
* | | merge from open-source masterThe Android Open Source Project2010-09-014-0/+248
|\ \ \ | | |/ | |/| | | | Change-Id: I904122226e2940610970b75588884c2efe2d2000
| * | Revert "Fixed problem with keymap files copied to target"Jean-Baptiste Queru2010-09-014-0/+248
| | | | | | | | | | | | This reverts commit 246e0ee6968ed0030fe99cc12ca154a1513b8645.
* | | merge from open-source masterThe Android Open Source Project2010-08-314-248/+0
|\ \ \ | |/ / | | | | | | Change-Id: If9dd02177b9e33556969be3b8eda46a362a424a6
| * | Fixed problem with keymap files copied to targetMagnus Karlsson2010-08-304-248/+0
| |/ | | | | | | | | | | | | | | | | | | | | Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps to build/target/board/generic. This causes the keymap files to copied into the system image of generic and sdk products, but not into the system image of HW products. Originally the qwerty.kl was copied to target no matter if the target had a qwerty keyboard or not, which is the case for e.g. the Nexus One. Change-Id: I37ad5fb11fa70640433594c18953b626d1e9c186
* | WXVGA 1280x800 skin for emulator.Raphael Moll2010-08-1214-0/+442
|/ | | | Change-Id: I42b7e24a824d42bf53efcc6cf487102021c7b8d8
* qemu-props: Signal end of property list.Dries Harnie2010-06-071-2/+4
| | | | Change-Id: I16f8c8b370f42c6229b3deabd66d2aaabd0b7937
* Add AT keyboard mappings for a BACK and MENU keyBruce Beare2010-05-051-1/+3
| | | | | BACK == ESC MENU == F10
* merge from tools-r6The Android Open Source Project2010-04-082-0/+23
|\ | | | | | | Change-Id: If11d893ba56c1189620e00f86b7f51bf4d698e49
| * Add missing licensing files.David 'Digit' Turner2010-04-012-0/+23
| | | | | | | | Change-Id: I1e3159ac3d322ca70c2d9d7faf3a0ecac4313468
* | New GPS HAL for qemuMike Lockwood2010-04-052-0/+971
|/ | | | | | | This will replace equivalent code in libhardware_legacy Change-Id: I611e34a187ed8460490f793538446c11c7c83cab Signed-off-by: Mike Lockwood <lockwood@android.com>