aboutsummaryrefslogtreecommitdiffstats
path: root/distrib
Commit message (Collapse)AuthorAgeFilesLines
* Add SSE optmized IDCT in JPEG decoding emulatorAndrew Hsieh2012-08-284-1/+353
| | | | | | | Port from related CL: https://android-review.googlesource.com/#/c/38840 Change-Id: Iba7183c2760701a95e27355b91835285d63bf7bc
* Delete sdl-1.2.12Jesse Hall2012-07-23658-181463/+0
| | | | Change-Id: Ia96f80df04035ae84be3af468c945f2cec14f99c
* Switch to sdl 1.2.15 and build from source on osxJesse Hall2012-07-231-9/+1
| | | | Change-Id: I036eefd9789bfe346e9ee5acc15c1d9ffe995c94
* Remove link dependency on SDL_audio.c which we don't buildJesse Hall2012-07-231-1/+4
| | | | Change-Id: Iac0a43a0ccc29bf891f37117fa856ca36e28c4de
* Apply Android changes from sdl-1.2.12 to sdl-1.2.15Jesse Hall2012-07-2226-41/+1700
| | | | | | | | These changes come from diffing Android's sdl-1.2.12 tree against a pure upstream sdl-1.2.12 tree, and then manually applying those differences to the sdl-1.2.15 tree. Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73
* Import SDL release-1.2.15Jesse Hall2012-07-221367-0/+393331
| | | | Change-Id: I505c4aea24325cad475f217db5589814b4c75dbf
* [MIPS] Copy vmlinux to kernel-qemuBhanu Chetlapalli2012-06-051-2/+2
| | | | | | | MIPS Qemu kernel build does not generate a compressed z/bzImage. Change-Id: I74bb4a85c034f0b72fa2e81f13f79c140c01eabe Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* fix BUILD_DEBUG_EMULATOR buildIliyan Malchev2012-06-011-1/+2
| | | | | Change-Id: Ib888b8114d77270383c6ac563fb36bfdaf7b72fc Signed-off-by: Iliyan Malchev <malchev@google.com>
* replace _exit() with exit()Iliyan Malchev2012-06-011-4/+4
| | | | | | | | | | When the emulator is compiled with -pg, it generates a stats file (gmon.out) upon exiting, as long as the exit it done when main() returns normally or exit() is called. Calling _exit() or exiting via an unhandled signal will not cause gmon.out to be generated. Change-Id: I0d5ea5a0b0314f97d2fdc0c92fd6f38c65377eb9 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Fixed prebuilt path and toolchain namesAndrew Hsieh2012-05-302-25/+21
| | | | | | | | | | | 1) Use "prebuilts" instead of "prebuilt" to legalize BUILD_TOP 2) Update CROSSTOOLCHAIN and CROSSPREFIX for all arch 3) Add -fno-pic because some toolchain (eg. x86 and mips) in prebuilts/gcc are NDK-compatible (ie. enforces -fpic, etc) Verified to build working kernel-goldfish for all arch Change-Id: I93ac8f0beeaae14aa4575629fd8eaf4af73ef7ce
* Merge "[MIPS] Add MIPS support to build-kernel.sh"Andrew Hsieh2012-05-291-3/+18
|\
| * [MIPS] Add MIPS support to build-kernel.shBhanu Chetlapalli2012-05-211-3/+18
| | | | | | | | | | | | Enables building of mips goldfish kernel Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | Merge "Replace i686-android-linux with i686-linux-android"Jean-Baptiste Queru2012-05-242-3/+3
|\ \ | |/ |/|
| * Replace i686-android-linux with i686-linux-androidH.J. Lu2012-05-032-3/+3
| | | | | | | | Author: "H.J. Lu" <hongjiu.lu@intel.com>
* | Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-05-041-0/+4
|\ \
| * | Xcode 4.3 compatibility checkinAl Sutton2012-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line tools from Xcode 4.3 create an incorrect implicit definition for a couple of functions which causes compilation to fail due to the actual definition not matching the implicit one the compiler creates. This patch adds explicit definitions alongside the other forward function definitions for the functions which cause compilation to fail. [updated: initial commit had the file in the wrong location] Signed-off-by: Al Sutton <al@funkyandroid.com>
* | | Add dynamic symbol for _XGetRequest, which libX11 1.4.99.1 addedJesse Hall2012-05-032-0/+30
| |/ |/| | | | | | | | | | | | | | | This is a cherry-pick from upstream to fix build errors on some Linux distros. Problem and patch pointed out by "quho" -- thanks! Upstream changeset: http://hg.libsdl.org/SDL/rev/e1264a758d50 Change-Id: I423c6ce2dfd7c6e53954b6fe76b156f12ae643f2
* | Enable multi-touch emulation with -gpu onVladimir Chtchetkine2012-04-112-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL implements a callback that gets invoked by OpenGLES emulator on it framebuffer updates. This allows transferring framebuffer changes to the supporting device. Proper implementation of this new callback also required changes to JPEG compression, addressing: 1. OpenGLES framebuffer format is RGBA8889, which required implementing line conversion for this format. 2. OpenGLES framebuffer is (or at least could be) bottom-up arranged. This requires changes to the compressor, so it compresses the FB starting from the bottom, so the resulting image is up-bottom. Change-Id: Icd4efbe4a251c838adfa3518decbfc43a7ef06c8
* | 64-bit emulatorAndrew Hsieh2012-03-131-1/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch to allow emulator searches for emulator64-${ARCH} first on 64-bit OS. If none is found, the original behavior which searchs for 32-bit emulator-${ARCH} is performed as usual. 64-bit emulator (which still emulates Android built in 32-bit) offers up to 20% speedup compared to its 32-bit counterpart. Details: android/main-emulator.c 1) search emulator64 based on the OS 2) dlopen lib64OpenglRender in 64-bit Makefile.* 1) Rules to build 64-bit executable emulator64-{x86,arm} and libraries emulator64-{libui,libqemu,target-i386,target-arm,libelff,common} 2) remove -Wa,-32 3) Changes prebuit toolchain path android-configure.h android/build/common.h 1) no longer force 32-bit build (because now prebuilts/tools/gcc-sdk/gcc can now handle 64-bit 2) set ANDROID_PREBUILTS to correctly locate ccache android/config/*/config-host.h 1) Detect HOST_X86_64 and HOST_X86_64/HOST_I386 Misc 64-bit porting clean-up 1) use %zx to print variable of type size_t in hex 2) use %zu to print variable of type size_t in dec 3) Initialize query_parm to NULL 4) use PRIu64 to replace PDUd64 5) use PRId64/PRIu64/PRIX64 to print 64-bit 6) drop PRUx64 because PRIx64 does the same 7) cast pointer arith to intptr_t before casting to int 8) fixed 1ULL<<63 Change-Id: Ife62a20063a6ec38d4a9b23977e840af1fce149a
* Enable RGB565 input color formatVladimir Chtchetkine2012-02-132-3/+69
| | | | | | | | | This change enables compression of RGB565 input to YCbCr (default) output format. Main intention for this change is to enable the emulator to directly compress RGB565 framebuffer without converting it into RGB888 prior to passing it to the compression routine. Change-Id: I86240a2481fd1904eb9b9140b18b372200a71093
* Include JPEG compression / decompression library into emulator buildVladimir Chtchetkine2012-02-01155-0/+60053
| | | | | | | | | | | | We are going to need JPEG compression for transferring emulator's framebuffers to the multi-touch supporting application running on an android device. The source for JPEG compressor has been copied over from external/jpeg To that I've added distrib/jpeg-6b/sources.make containing build instruction for JPEG compressor. That file gets included into Makefile.common to compile JPEG compressor sources along with the emulator sources. Change-Id: I7bfccb7a10f873f90edabab5d3b1b2ca4dd57449
* SDL: Call XInitThreads() after loading XlibJesse Hall2012-01-112-0/+2
| | | | | | | | | | | | | XInitThreads() enables thread-safety in Xlib, so multiple threads can safely call into it concurrently. This happens with GLES passthrough enabled: the GLES system serializes its own Xlib and GLX calls, but there is no serialization between the GLES system and the SDL code running the main UI. This call must be the first Xlib call, so I put it here in the loading code rather than the multiple places that call XOpenDisplay(). Change-Id: I3cd3177fb8e0904a803a6b5c8f89a4ecda73bd1c
* kernel: update build-kernel.sh script for x86David 'Digit' Turner2011-12-1611-0/+73
| | | | | | | | | | | | | This updates the build-kernel.sh script to be able to rebuild the x86 goldfish kernel from sources using our NDK-compatible toolchain. This is needed because the toolchain is configured with -mfpmath=sse and -fpic by default, which we need to disable. Because the kernel build system doesn't allow us to provide extra compiler flags easily, we create a "magic" wrapper toolchain to do it for us (see toolbox.sh) Change-Id: Ie868497dc5543d1149c51f354daa567863b638dc
* Fixed build-kernel.sh to set ZIMAGE when --cross is specifiedAndrew Hsieh2011-11-031-2/+8
| | | | Change-Id: I039cd6072795781a55d1f1280f9c2cf2d706b457
* Improve emulator kernel rebuild script.David 'Digit' Turner2011-03-091-22/+86
| | | | | | | | | | - Add support for building on darwin-x86 - Automatically finds the cross-toolchain (arch-dependent) if --cross=<prefix> is not used. - Add "Auto-config: <option>" message to indicate what was automatically configured - Select appropriate names for output files - Print their name on the terminal in case of success Change-Id: I908392083bf724a426d5029dc0a7dd29e045c7a4
* Add kernel-rebuilding script for the emulator.David 'Digit' Turner2011-03-051-0/+150
| | | | | | Supports both arm and x86. Change-Id: Ib4665eece4433f0a611b5420ef29785eeb26de1a
* Fixing the standalone build of the emulator.Stefan Hilzinger2011-02-222-3/+3
| | | | Change-Id: I81567b512df04314d87dd3846b02d8895829937d
* Fix incorrect orientation at boot.David 'Digit' Turner2010-10-201-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goldfish kernel's event driver is very picky about the state of the virtual device it talks to. Essentially, it can only listen to h/w events if the corresponding IRQ is raised _after_ it has completed some initial setup. If the IRQ is raised before, the driver will refuse to listen to events, and any interaction becomes impossible. We changed the way our UI windows are built and managed previously, and this had the unfortunate effect of sending one h/w event too soon, which, in the old code, would raise the IRQ prematurely. This resulted in an input freeze. To work around this the UI code was modified to not send the initial h/w event, but this resulted in bad orientation of the home screen at the end of the boot sequence. This change allows the virtual device to wait for the kernel driver before raising the IRQ, in the case any h/w event has been buffered. It also removes the hack in the UI code, allowing the send of the initial h/w event at startup. BONUS MINOR CHANGES: EsounD probe: fix error message. console: fix compiler warnings libpng: proper handling of MMX support. android-configure.sh: fix --ignore-audio handling The option didn't do anything if the audio development packages are properly installed on the system. Change-Id: Ib134158873d5cb72290c9676d92d20233226c889
* Don't build MMX stuff on PowerPCMarcus Comstedt2010-10-051-1/+5
| | | | Change-Id: Ieab047784761f8b9d0862b817319a903f26a4bf5
* Remove compiler warnings when building the emulator.David 'Digit' Turner2010-09-221-2/+0
| | | | | | | 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
* Make the emulator build on Snow Leopard.Jeff Hamilton2010-06-031-2/+2
| | | | | | Force the minimum platform version to Leopard. Change-Id: Ibfff1ad611e1f262b81a324a16a3a28f80ae9a17
* Build SDL from sources directly.David 'Digit' Turner2010-05-189-722/+254
| | | | | | | | | | | | | | | | 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
* Disable audio support in our custom SDL build.David 'Digit' Turner2010-05-145-19/+8
| | | | | | This is not needed anymore. Change-Id: Id41b71c95566804b92185282bb51e317efc67255
* merge from open-source masterJean-Baptiste Queru2009-09-151-0/+126
|\
| * Added SDL_config.h to use on FreeBSDAlexey Tarasov2009-09-081-0/+126
| |
* | Fix EsounD audio backend and bump version number.David 'Digit' Turner2009-08-211-12/+11
|/ | | | | | | | | | | | | | | | | | | | | 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-08663-560/+181792
| | | | | | 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-0352-0/+48664
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0352-48664/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-2/+4
|
* auto import from //branches/cupcake/...@127436The Android Open Source Project2009-01-221-5/+15
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-2/+0
|
* Initial ContributionThe Android Open Source Project2008-10-2152-0/+48654