aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
Commit message (Collapse)AuthorAgeFilesLines
* Moved android_emulation_setup from android/main.c to android/qemu-setup.cVladimir Chtchetkine2010-05-141-0/+1
| | | | Change-Id: Ic66bb0d07e28088ae02055c88d37bfd00edea592
* Upstream: HAVE_IOVEC => CONFIG_IOVECDavid 'Digit' Turner2010-05-111-1/+1
| | | | Change-Id: I18025d9c154a02af5d6298c7d7f72fc9f2c1c5d7
* Upstream: Misc integration - includes qobject.h and related sourcesDavid 'Digit' Turner2010-05-111-1/+11
| | | | Change-Id: Idfa93ab5c67c95a3bc1869eeaf3a84a75fe24cd6
* Moved QEmulator out of main.cVladimir Chtchetkine2010-05-111-0/+1
| | | | Change-Id: I20964bb5d7fbef5ea22d265427793a2a7fce2017
* Upstream: Move ioport code to ioport.[hc]David 'Digit' Turner2010-05-111-0/+1
| | | | Change-Id: I41aa30fff127338665a6a32fa66dcd43dd3bfe8b
* Upstream: Replace sys-queue.h with qemu-queue.hDavid 'Digit' Turner2010-05-101-1/+0
| | | | Change-Id: I5c51f54a7fe2ea702420429bbf0c789ed6d8c534
* Upstream: Use CONFIG_BSD instead of _BSD and HOST_BSDDavid 'Digit' Turner2010-05-101-1/+1
| | | | | Also fix OS X build, which failed with a link error. Change-Id: Idd63f25dc1f46ea66da5727c7577def34f048c3c
* Separate audio stack and SDLVladimir Chtchetkine2010-05-041-1/+1
| | | | Change-Id: Ibf3d08172807bca7dc46d70bf51d5eadaed4372b
* Changes to build Windows emulator under Linux/MinGWRaphael2010-04-141-3/+14
| | | | | | | | - Linux being case-sensitve, include "windows.h" instead of "Windows.h" is important. - Use MinGW's windres. - No pthread needed. Change-Id: Ib4ce944bb55a8b1d870e230f269c89cb7df0b3f2
* Move file I/O out of ELFF, abstracting them in platform-independent fasion.Vladimir Chtchetkine2010-03-251-0/+1
| | | | Change-Id: Ie8800dc96db810e352618bfea8243ab008ae9d2c
* Add --static option to android-configure.sh in order to build static ↵David 'Digit' Turner2010-03-081-1/+8
| | | | | | | | | | emulator executable. This is needed to run the emulator in restricted environment where libX11.so and even libstdc++.so are not available. Only tested on Linux. The resulting binary will not start unless you use -no-window. Also don't expect any audio output working. Change-Id: Ia736898cd3ae6eb928614a00a1a3e18cc8086a5c
* Fix standalone debug builds of the emulator.David 'Digit' Turner2010-02-251-1/+3
| | | | | This only affects builds performed with ./android-rebuild.sh --debug, not normal Android/SDK builds of the emulator program.
* Merge memory checking from sandboxVladimir Chtchetkine2010-02-181-2/+74
| | | | Change-id: Ibce845d0
* merge from open-source masterThe Android Open Source Project2010-01-211-1/+10
|\
| * Force gcc-4.0 for qemu build on Mac OS XKenny Root2009-11-151-1/+10
| | | | | | | | | | | | | | The Android build of qemu forces SDK 10.4, but doesn't specify a GCC version. This works fine for Mac OS X 10.4 - 10.5, but fails for 10.6. Change-Id: Id241a12ddc3fbf100cd15a0e93e6d61b4aecb3fd
| * merge from eclairJean-Baptiste Queru2009-11-151-18/+137
| |\
| | * eclair snapshotJean-Baptiste Queru2009-11-121-18/+137
| | |
* | | am a383d02c: Extract emulator major version number from SDK Tools package ↵David 'Digit' Turner2009-12-031-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revision. Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-plus-aosp * commit 'a383d02cb57dd7dadd382654175e51354073a139': Extract emulator major version number from SDK Tools package revision.
| * | | Extract emulator major version number from SDK Tools package revision.David 'Digit' Turner2009-12-031-0/+11
| | | | | | | | | | | | | | | | | | | | The minor version number is now always 0, this makes the next version number "5.0" currently in the eclair branch.
* | | | am 2ec45595: Fix the build.David 'Digit' Turner2009-10-071-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '2ec4559513cf475d499435444dffe8566c3aaaf3' into eclair-plus-aosp * commit '2ec4559513cf475d499435444dffe8566c3aaaf3': Fix the build.
| * | | Fix the build.David 'Digit' Turner2009-10-071-4/+4
| | | |
* | | | am 065242de: Ensure android/avd/hw-config-defs.h is properly regenerated as ↵David 'Digit' Turner2009-10-071-0/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed. Merge commit '065242de51ba1e18387ce22a99eb091a859990f7' into eclair-plus-aosp * commit '065242de51ba1e18387ce22a99eb091a859990f7': Ensure android/avd/hw-config-defs.h is properly regenerated as needed.
| * | | Ensure android/avd/hw-config-defs.h is properly regenerated as needed.David 'Digit' Turner2009-10-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the emulator's build system to ensure that the file at android/avd/hw-config-defs.h is regenerated automatically each time that android/avd/hardware-properties.ini is itself changed. Tested with both the Android build system, and the standalone one.
* | | | am 06074941: Merge change 25638 into eclairDavid 'Digit' Turner2009-09-191-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-18/+122
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge upstream QEMU 10.0.50 into the Android source tree.David 'Digit' Turner2009-09-141-18/+122
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Added option to build link with libutilAlexey Tarasov2009-09-081-0/+4
|/
* Fix Leopard-built emulator binaries to run on Tiger.David 'Digit' Turner2009-08-211-9/+9
| | | | | | | | | | The bug was that the full Android build system treats LOCAL_LDFLAGS and LOCAL_LDLIBS slightly differently. The 10.4 SDK was not properly used when linking on Leopard, and this resulted in hidden dependencies on late versions of CoreFoundation and AppKit that are not available on Tiger. Note that this change doesn't break the standalone build (standalone Leopard binaries still run on Tiger, as they did previously).
* Make ./android-configure.sh --debug work as advertized.David 'Digit' Turner2009-07-301-0/+7
| | | | Note that this does not affect the normal Android build of the emulator.
* Add a new hw.lcd.density hardware property to AVD configuration files.David 'Digit' Turner2009-06-191-0/+1
| | | | | | | | | | | 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.
* Add our modified SDL sources under distrib/sdl-1.2.12David 'Digit' Turner2009-06-081-12/+6
| | | | | | 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
* AI 149526: Cloned from CL 149504 by 'g4 patch'.David Turner2009-06-031-1/+18
| | | | | | | | Original change by digit@digit-cupcake-mounini on 2009/06/03 00:38:49. Try to fix the emulator for Tiger, i.e. use the 10.4 SDK when building on Leopard or above. BUG=1892943 Automated import of CL 149526
* AI 149496: Backport emulator-related donut fixes into cupcake.David Turner2009-06-021-0/+1
| | | | | | | | | | | | | This includes the following fixes: - remove potential qemud crash at system boot - fix GPS fix emulation - fix inter-emulator networking (DNS resolution helper now behaves correctly on all IPv6-capable systems) - add -prop <name>=<value> option to add system properties on boot - allow F5 keybinding for SEARCH on keyboard-less hardware configurations - allow skins to provide a "search" button - fixed bad QADD/QSUB/QDADD/QDSUB ARM CPU instructions emulation Automated import of CL 149496
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-2/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+538
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-537/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-1/+0
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-0/+1
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-210/+192
|
* auto import from //branches/cupcake/...@127436The Android Open Source Project2009-01-221-68/+122
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-7/+7
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-24/+71
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+454