aboutsummaryrefslogtreecommitdiffstats
path: root/android/build
Commit message (Collapse)AuthorAgeFilesLines
* 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
* x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.Jun Nakajima2011-02-021-0/+5
| | | | | | | 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>
* standalone builds: windows executables end in .exeDavid 'Digit' Turner2010-10-141-1/+1
| | | | | | | | | | | | | | | | This change only applies to the stand-alone build system. It ensures that when one does the following under Linux: ./android-configure.sh --mingw make then, the Windows executables that are generated have their name ending in .exe (e.g. objs/emulator.exe instead of objs/emulator) This does not affect the Android build system which already does the right thing (and is used to build SDK binaries). Change-Id: If9597e550f0bceec04d334eb84199a0f024a3fdf
* Add <fnmatch.h> check to android-configure.hDavid Turner2010-09-131-1/+1
|
* Enable --mingw option in android-configure.shDavid 'Digit' Turner2010-06-101-0/+70
| | | | | | This should ease testing of the Windows build during development. Change-Id: I45cc9e396a0e82d764cf7a27fd40ad7c5367c51a
* Build SDL from sources directly.David 'Digit' Turner2010-05-181-1/+17
| | | | | | | | | | | | | | | | This removes the requirement to build the SDL library before the rest of the emulator. The prebuilt SDL library and installation is now optional and is only kept for the full Android build on Linux (mainly to avoid having to install many dev libraries on build servers). This patch affects both the Android and standalone build systems. The script android-configure.sh will not use a prebuilt SDL installation unless you explicitely use --sdl-config=<script>. Tested for linux-x86 / darwin-x86 / cygwin / linux-mingw builds. Change-Id: If973b2ad199f06aeeff43aec387d1ac629487529
* am c973b058: Add support to the emulator\'s standalone build system for C++ ↵David 'Digit' Turner2010-01-073-0/+26
|\ | | | | | | | | | | | | | | | | sources. Merge commit 'c973b058ebe38bb585a9a6026e39519db1f91c33' into eclair-plus-aosp * commit 'c973b058ebe38bb585a9a6026e39519db1f91c33': Add support to the emulator's standalone build system for C++ sources.
| * Add support to the emulator's standalone build system for C++ sources.David 'Digit' Turner2010-01-073-0/+26
| |
* | resolved conflicts for merge of 5d8f37ad to eclair-plus-aospJean-Baptiste Queru2009-09-152-2/+8
|\ \ | |/
| * Merge upstream QEMU 10.0.50 into the Android source tree.David 'Digit' Turner2009-09-142-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+6
|\ \ | |/ |/|
| * General changes to support freebsd system in building scriptsAlexey Tarasov2009-09-081-0/+6
| |
* | Fix EsounD audio backend and bump version number.David 'Digit' Turner2009-08-211-12/+0
|/ | | | | | | | | | | | | | | | | | | | | 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.
* Add our modified SDL sources under distrib/sdl-1.2.12David 'Digit' Turner2009-06-082-2/+533
| | | | | | 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
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-037-0/+312
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-037-312/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-103-2/+30
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-092-7/+6
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-177-0/+285