aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
Commit message (Collapse)AuthorAgeFilesLines
* qemu-timer.c: upstream integrateDavid 'Digit' Turner2011-06-011-3/+3
| | | | Change-Id: I6856ded73b4dcd10fe4831697c8518f958aeffbb
* os-posix.c + os-win32.c and dependenciesDavid 'Digit' Turner2011-06-011-2/+5
| | | | | | + Generate qemu-options.def instead of qemu-options.h Change-Id: I043e6b0c1c58e5cc2e96d05465f39b42f9054b5a
* Add 'emulator' launcher program.David 'Digit' Turner2011-05-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | This patch renames the current ARM-specific emulator binary to 'emulator-arm' and introduces a new tiny (less than 20KB) 'emulator' launcher program. The role of 'emulator' is to launch either 'emulator-arm' or 'emulator-x86' based on the target AVD or platform build being used. This program will be replaced in the future by what is currently known as 'emulator-ui', but is a good placeholder until this work is completed. + Move some utility functions from android/avd/info.[hc] to android/avd/util.[hc] so that 'emulator' can use them directly. IMPORTANT: For platform builds, the target architecture is detected automatically by parsing the build.prop file. For SDK AVDs however, there is no easy way to determine the target architecture, so the patch adds a new hw.cpu.arch property which can have value 'arm' or 'x86' Change-Id: I0084c196695a75c8b9230ba716b3cd2e12610ded
* Fix windows build when USE_CCACHE is defined.David 'Digit' Turner2011-03-121-0/+1
| | | | | | | This avoids a problem where the Makefile force the use of the non-existing prebuilt/windows/ccache/ccache. Change-Id: Icad0fb91a211787bbe73b169aa4e8046de349679
* Fix the standalone emulator build.David 'Digit' Turner2011-03-021-1/+3
| | | | | | The previous commit broke it due to the way it handled LOCAL_AR. Change-Id: I3458f9306b3fca9771d868673ae89f4d995aeec3
* 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
* Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-241-1195/+76
| | | | | | | | | | | | 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-231-1/+1
| | | | | | | | | | | | 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
* Revert "Build arm and x86 binaries at the same time."Xavier Ducrohet2011-02-091-60/+1201
| | | | | | This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
* Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-101-1201/+60
| | | | Change-Id: I105c5a097c988cb964b47b40b71c7a08af0d9210
* Rename qemu-android to qemu-android-$(TARGET_ARCH)David 'Digit' Turner2011-02-091-2/+1
| | | | | | | This makes it easier to distinguish between the ARM and x86 versions of the program. Change-Id: Id6991e4c4b14c560d1732da05e253c678ca392d9
* x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.Jun Nakajima2011-02-021-30/+107
| | | | | | | 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>
* Simplify UI-only sources.David 'Digit' Turner2011-02-021-4/+1
| | | | | | | | | | 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
* Move framebuffer.h to android/David 'Digit' Turner2011-02-021-3/+3
| | | | | | | 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-021-1/+1
| | | | Change-Id: I1f04ed1f00fccdea043f4a4fbf5ba745b36bbcc7
* Move common main routines from into android-common.[hc]David 'Digit' Turner2011-02-021-0/+2
| | | | | | This is a first step towards cleaning-up our initialization/startup code. Change-Id: I2d4fbc5c2cd0181fb39a1a97a15650945038c3b9
* Add cache-util.c to built sources for PPCMarcus Comstedt2011-02-011-1/+2
| | | | | | | The file cache-utils.c contains code that is referenced in a build for a PowerPC host. Change-Id: I284481d4015de8d7fc230014faf9a1ead61c222c
* Refactor attach-UI serviceVladimir Chtchetkine2011-01-311-0/+2
| | | | Change-Id: Ia68ceb57ee5b5a66fa76b837fe3b990eb12e7188
* Refactor the framebuffer serviceVladimir Chtchetkine2011-01-311-2/+2
| | | | Change-Id: I8ac4580af65b8d58976c97b77b309dd202e75003
* Refactored user-events protocolVladimir Chtchetkine2011-01-281-2/+2
| | | | Change-Id: I08afb96ef17a52c3795f5029acfc244a93ab57c7
* Refactored ui-core-control and core-ui-control protocolsVladimir Chtchetkine2011-01-281-5/+6
| | | | | | | Also cleaned the code up from obsolete ui-core-protocol.* and core-ui-protocol.* Change-Id: I194bec669d25b68a10c32b2be50bc9da50c52ebb
* Implement UI control service and clientVladimir Chtchetkine2011-01-251-0/+2
| | | | Change-Id: Iecc1b5bb9ddcdaf9f22c500a5195718db3f25354
* Implement user event transmission between the UI and the coreVladimir Chtchetkine2011-01-191-0/+1
| | | | Change-Id: I503aa691cada5250b76167a923d4a226d20ee41d
* Refining main-ui.c to better separate UI and core related initializationVladimir Chtchetkine2011-01-131-2/+2
| | | | | | | | | | | The main reason for this is to clarify initialization for UI that starts core, and UI that attaches to an existing core. In this CL I did: - Removed -initdata option that seems obsolete (doesn't affect anything in the code) - Passed through -timezone option that doesn't affect anything in the UI, and is needed only in the core. - Removed dependency on AVD info from the core (core needed only virtual device name) Change-Id: Ie631249848a1b5b8d837c0c7b201a40ee7e4a367
* Fix Darwin build.David 'Digit' Turner2011-01-061-1/+1
| | | | | | | The reason for the build breakage is still mysterious though. Were the system headers updated during the last system update ?!? Change-Id: Ib0ea2b54bf7ffad907752c3a82fb4bbe686425a5
* upstream: integrate block changesDavid 'Digit' Turner2011-01-021-1/+10
| | | | | | | | This large patch upgrades the block support code to the upstream version available in ba5e7f82169f32ab8163c707d97c799ca09f8924 dated 2010-08-08 Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
* upstream: Move bottom-half handlers to async.cDavid 'Digit' Turner2011-01-021-0/+1
| | | | Change-Id: Ibd4321edb2abe349d32483a60fdb94a282f22240
* Add -audio-test-out option to the core.David 'Digit' Turner2011-01-021-0/+2
| | | | | | | | | | | | | This option can be used to quickly check audio output (without having to boot a full AVD and launch a sound-playing application). Usage: emulator <other-options> -qemu -audio-test-out qemu-android <other-options> -audio-test-out This simply generates an ugly saw signal, but that's enough for us. Change-Id: I060300b4000b9705d181c6262de8d4d13c749e69
* Resubmit framebuffer service implementationVladimir Chtchetkine2010-12-201-0/+2
| | | | Change-Id: I184e27a1e8d88835bc9f0502eccfa3f64a7aaf9e
* Implement core display deriving it from android displayVladimir Chtchetkine2010-12-141-0/+1
| | | | | | | Core display is a framebuffer client that receives framebuffer updates and dispatches them to the UI attached to the core. Change-Id: Iff1e0609cbe66240031e3670934a6796a9ae3b15
* Submit mergedVladimir Chtchetkine2010-12-061-0/+1
| | | | | | | | | | | | | | Squashed commit of the following: commit aeefab810c6331e2f96e81f20e4408b39dd3a2ca Author: Vladimir Chtchetkine <vchtchetkine@google.com> Date: Thu Dec 2 07:40:34 2010 -0800 Implement -attach-core UI option Change-Id: I4168e2d707cab1b4873ee16d86d5126c1a316abf Change-Id: I2da1ef5d53641f3c60d83d8d5ddf3aff34b0c6c7
* Implement helper routines for syncronous socket operationsVladimir Chtchetkine2010-12-011-0/+1
| | | | Change-Id: I93af5f740decb1fb0f6e037a76223fa8dd5305ac
* Separate main.c used to build the emulator from main-ui.c used to build the UIVladimir Chtchetkine2010-11-241-1/+1
| | | | Change-Id: I1c7baeaa8447fe1df895869bfb6b74631b765845
* Introduce asynchronous operation helpers.David 'Digit' Turner2010-11-191-0/+2
| | | | | | | | | | <android/async-utils.h> contains generic helpers to read, write and connect to sockets. <android/async-console.h> contains a helper class to connect to Android console port asynchronously. Change-Id: I5d0a49a770ad974c5d4382438d75e9eb624368d1
* Implementation of event loop abstraction.David 'Digit' Turner2010-11-181-3/+7
| | | | | | | | | | | | | | | This patch adds "android/looper.h" which provides an abstraction for event loops: - android/looper-qemu.c implements it on top of the QEMU main event loop. - android/looper-generic.c implements it on top of an IoLooper object. The main idea is to move the UI-related code to use the abstraction to handle timers and asynchronous (network) i/o. NOTE: Code compiles but has not been heavily tested. Change-Id: Ib6820c1b9a9950dc22449a332bc1b066a07af203
* Update android/utils/ with misc. new features.David 'Digit' Turner2010-11-171-2/+6
| | | | | | | | | | | | This introduces a few new features to android/utils/ that will be used in later patches. + <android/utils/assert.h> to handle assertions + <android/utils/vector.h> to handle dynamic arrays + <android/utils/reflist.h> slightly updated (more docs) + <android/utils/refset.h> implements a set of pointers Change-Id: Iebc14cfefd1c0e8aaecda9958a980d40f0be610a
* Implement -list-cores UI optionVladimir Chtchetkine2010-11-101-0/+1
| | | | | | | Also fixed a bug in iolooper-select.c (io_looper_del_write was buggy) Also switched iolooper-select.c to use malloc/free instead of qemu_xxx Change-Id: Ief47608f30a863d624af6363620e93e903cbdadc
* Add command line flag to show list of snapshots.Ot ten Thije2010-10-281-0/+2
| | | | | | | | | | | | | | This patch introduces the flag '-snapshot-list', which causes the emulator to output a table of snapshots in the currently mounted snapshot storage file. The snapshot file is accessed with a very simple driver for the Qcow2 file system, independent of Qemu's block driver framework. This way, the flag is available in the emulator-ui builds as well. Using Qemu's framework would have resulted in adding a lot of Qemu dependencies to the UI build, which we are explicitly trying to avoid. Change-Id: I059b9ac53e2f8e051757a5c637761eccf8ea17cb
* Control state snapshots from Android console.Ot ten Thije2010-10-281-0/+1
| | | | | | | | | | | | | This patch exposes Qemu's save, load, delete and list commands for state snapshots on the Android console. A level of indirection is added by means of the OutputChannel construct. This allows us to show the output of the Qemu commands on the console rather than on the monitor, while minimizing the differences with the upstream codebase. The new commands are exposed only when the configuration constant CONFIG_ANDROID_SNAPSHOTS is not 0. Change-Id: I558d5cd505d321fe2da5835713d341d151f60534
* Fix emulator build.Jean-Baptiste Queru2010-10-221-1/+1
| | | | Change-Id: I87f1695d61654a09ef40fa883cbc73acd59ac4c8
* Fix ping version reporting.David 'Digit' Turner2010-10-231-20/+22
| | | | | | | | The emulator version reported through ddms was incorrect in the SDK r7 emulator binary due to a previous change in our Makefiles. Change-Id: I16fc16739de8490c63d802567226b74db7f74e0f
* emulator-ui: Remove dependencies from qemu sources.David 'Digit' Turner2010-10-191-4/+5
| | | | | | This change removes some QEMU-specifics that crept into the UI code. Change-Id: Ib1974dc64e54a35dc0cd01aec1eb547a9263a0c8
* qemu: Multimode supportJaime Lopez2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Preliminary implementation of a Multimode modem - Added the +CTEC AT command which allows querying and setting the current technology - Added preliminary NVRAM file support Add cdma subscription source support - Add support to save the subscription source preference to nv. - Add command 'cdma ssource' to switch subscription source from the emulator console Implement AT+WRMP command Implement the AT+WRMP command to set and get the roaming preference Implement Emergency Callback Mode Implement the +WSOS command and unsol to notify Emergency Callback Mode status Implement +WPRL AT Command Enable PRL update notification by implementing the AT+WPRL query command Implement a console command to send +WPRL unsolicited response Change-Id: I5c036c1b0832b94c0b7675931f6a18b5d9ca7436
* Don't prepend ccache if it's already thereYing Wang2010-10-081-1/+5
| | | | | Bug: 3069576 Change-Id: I8345209c5c885ed7ed8e043e051884d64008961c
* Cleanup warnings in the standalone UI buildVladimir Chtchetkine2010-10-081-5/+3
| | | | Change-Id: I2dc79f9d0b3916749366aa4155431420e05888c1
* Build standalone UI program (emulator-ui).David 'Digit' Turner2010-10-081-4/+101
| | | | | | | | | | | | | | | | This changes introduces a new program, called emulator-ui that only contains parts necessary to display the UI (and removes anything related to CPU emulation). This is only a skeleton right now, since it is not capable of launching a core, or displaying anything meaningful, except the skin, trackball, respond to commands (e.g. change layouts with KP-7 and KP-9). Later changes will introduce core launching, communication, etc... Change-Id: Icef9deb8a3a256532655e1cd409b4aab52565d03
* Make core initialization replying to the UI at the end of initialization.Vladimir Chtchetkine2010-10-081-0/+1
| | | | | | Also, this CL contains a minor fix to formatting boot options passed to the kernel Change-Id: I267172d82094a0cbbbced2cee7a2990bb7fa3793
* Remove compiler warnings when building the emulator.David 'Digit' Turner2010-09-221-0/+5
| | | | | | | This forces -Wall during the build. Note that this patch doesn't remove all warnings, but most of the remaining ones are from upstream anyway. Change-Id: I8808d8495e99866e156ce5780d2e3c305eab491f
* Remove duplicate rules for generated source file.David 'Digit' Turner2010-09-201-15/+0
| | | | Change-Id: I68075edc871af6510edbb027ac7de29ddbc85842
* Fix Makefile by adding mandatory user tags.David 'Digit' Turner2010-09-201-0/+1
| | | | | | The build system now requires a LOCAL_MODULE_TAGS definition in each Android.mk Change-Id: I080a721224dcf6cb24fa2a803a52dcfe7f626cd6
generated by cgit v1.1 at 2024-06-13 09:47:48 +0000