aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Upstream: HOST_WORDS_ALIGNED -> WORDS_ALIGNEDDavid 'Digit' Turner2010-05-1024-42/+42
| | | | Change-Id: Ica9022695d83fb48a8c25fdb1e1f0dc1c63747ff
* Fix emulator OS X build when using the Android build system.David 'Digit' Turner2010-05-102-2/+2
| | | | Change-Id: Ia19b4e14b84c12edc040a70144a97b5ca9474b00
* Upstream: Use CONFIG_BSD instead of _BSD and HOST_BSDDavid 'Digit' Turner2010-05-1027-69/+206
| | | | | Also fix OS X build, which failed with a link error. Change-Id: Idd63f25dc1f46ea66da5727c7577def34f048c3c
* net_socket_receive_dgram: use socket_sendto instead of sendtoDries Harnie2010-05-071-2/+1
| | | | Change-Id: Icc4cf861961135ff66094e0de98471aef06ba442
* Separate audio stack and SDLVladimir Chtchetkine2010-05-045-669/+11
| | | | Change-Id: Ibf3d08172807bca7dc46d70bf51d5eadaed4372b
* When running from the Android build system and no skin is definedJeff Hamilton2010-04-271-3/+18
| | | | | | on the command line check for a skin in $ANDROID_PRODUCT_OUT/skin. Change-Id: I776aa481b38bd4e48982fdb5c032a10c970576a8
* merge from tools_r6The Android Open Source Project2010-04-270-0/+0
|\ | | | | | | Change-Id: I6ad57ad0cb13b1411a4811feef3657b2a66d130b
| * Changes to build Windows emulator under Linux/MinGWRaphael2010-04-233-5/+16
| | | | | | | | | | | | | | | | | | | | - Linux being case-sensitve, include "windows.h" instead of "Windows.h" is important. - Use MinGW's windres. - No pthread needed. (Merged from master Change Ib4ce944b) Change-Id: I29050b0013a6f9a3f1fd72e586a77c27d559b15a
* | merge from tools_r6The Android Open Source Project2010-04-1912-376/+45
|\ \ | |/ | | | | Change-Id: I860d4b338cba9ea749797d6607b262c8072dd1f6
| * Revert previous patch to fix SD Card emulationDavid 'Digit' Turner2010-04-1512-376/+45
| | | | | | | | | | | | | | | | | | | | | | The previous patch modifies SD Card hardware emulation in a way that is not backwards compatible with previous SDK platform releases. This has the unfortunate effect of making SD Card emulation not work properly when running existing AVDs. Reverting the patch until we get a better one. Change-Id: I82dac87709d88aa3bd292bf2ed0008ae74d95853
* | Changes to build Windows emulator under Linux/MinGWRaphael2010-04-143-5/+16
| | | | | | | | | | | | | | | | - Linux being case-sensitve, include "windows.h" instead of "Windows.h" is important. - Use MinGW's windres. - No pthread needed. Change-Id: Ib4ce944bb55a8b1d870e230f269c89cb7df0b3f2
* | merge from tools-r6The Android Open Source Project2010-04-085-132/+69
|\ \ | |/ | | | | Change-Id: I8b1287b619b6ec77024cb1ce56fabc80d2b1146d
| * Automatically parse a file named 'hardware.ini' if it is foundDavid 'Digit' Turner2010-04-061-0/+35
| | | | | | | | | | | | in the skin directory, and we are using the Android build system. Change-Id: I62480314f73ae60e769c113d6e4421e9946bb818
| * Revert change I7af83e21c64d217c6b28bf6cb5ee2e2f23182c95 to fix Froyo build.Vladimir Chtchetkine2010-04-023-131/+24
| | | | | | | | | | | | | | | | | | Apparently, that change that supposedly fixed AT-related ARMv7 bug broke DexOpt step in the build process, resulting in trashed files that crash the device. Rolling this change back to fix Froyo, until cause of the DexOpt breaking has been found and fixed Change-Id: I33b417fcbd65767f7cfe60f5fb5ffa32610b4852
| * Fix emulator changelogDavid 'Digit' Turner2010-03-311-1/+10
| | | | | | | | Change-Id: I77ddd628c7fea0b128623cecd336842673f07940
* | Merge "Making the port where adb is expected configurable."David Turner2010-03-301-2/+17
|\ \
| * | Making the port where adb is expected configurable.Stefan Hilzinger2010-03-311-2/+17
| | | | | | | | | | | | | | | | | | | | | Environment variable ANDROID_ADB_SERVER_PORT allows to control the port the emulator expects adb to be listening on. Change-Id: Ibe52c02829ac9a0308f2cf5da32a57ab773110f8
* | | Add documentation for framebuffer emulation.David 'Digit' Turner2010-03-301-0/+88
| |/ |/| | | | | Change-Id: I9f1ac21df0e6644533c4f35fe51e08ae7a979fb3
* | Updating the build instructions.Stefan Hilzinger2010-03-261-3/+3
|/ | | | Change-Id: I8e8ed1507d98c8522bae182831888ae4ceda83f3
* Merge "Move file I/O out of ELFF, abstracting them in platform-independent ↵Vladimir Chtchetkine2010-03-258-159/+414
|\ | | | | | | fasion."
| * Move file I/O out of ELFF, abstracting them in platform-independent fasion.Vladimir Chtchetkine2010-03-258-159/+414
| | | | | | | | Change-Id: Ie8800dc96db810e352618bfea8243ab008ae9d2c
* | Fix Win32 socket error handling.David 'Digit' Turner2010-03-259-18/+28
|/ | | | | | This also fixes -http-proxy support on Windows. Change-Id: I741b224511c064412ac39351ed4f1b9146a313a5
* Make return address table independent from process context.Vladimir Chtchetkine2010-03-242-13/+19
| | | | | | | | Use physical addresses (instead of emulated ones) for registered return addresses. This way addresses will be independent from process context, as even if virtual addresses may overlap, the physical ones will not. Change-Id: If5be5174286be0a456c47c48812d7cc9bf19bc1f
* Fixes for obvious ARMv7 bugs in emulator.Vladimir Chtchetkine2010-03-233-24/+131
| | | | | | | | | | | | | | This CL doesn't fix ARMv7 problems in the emulator (emulated system still crashes, although with these fixes it crashes much later than without them), however, this CL fixes real bugs related to IT block translations. In particular, it fixes: - Wrong ITSTATE calculation on condition that gen_intermediate_code_internal is called with search_pc parameter set to 1. In the original code ITSTATE was blindly inherited from the CPU's condexec_bits field, without consideration that translation could be performed starting from an address that has nothing to do with the current ITSTATE. Change-Id: I7af83e21c64d217c6b28bf6cb5ee2e2f23182c95
* Small doc update and make CleanSpec.mk empty to avoid confusion.David 'Digit' Turner2010-03-092-48/+18
| | | | Change-Id: I2caa5b377f2e9ebeb543cda6e108ff87bc9de772
* Merge "Add --static option to android-configure.sh in order to build static ↵David 'Digit' Turner2010-03-093-1/+70
|\ | | | | | | emulator executable."
| * Add --static option to android-configure.sh in order to build static ↵David 'Digit' Turner2010-03-083-1/+70
| | | | | | | | | | | | | | | | | | | | 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
* | Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
|/ | | | Change-Id: I9a2b5f38c5f3eb73d4309c195c88fc60e97eddea
* 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.
* Make trace filename message only display with -debug-init / -verboseDavid 'Digit' Turner2010-02-251-2/+6
|
* Merge memory checking from sandboxVladimir Chtchetkine2010-02-1857-137/+12458
| | | | Change-id: Ibce845d0
* am 720b75ff: (-s ours) am 6c77585b: Merge "Revert previous patch to fix SD ↵David Turner2010-02-080-0/+0
|\ | | | | | | | | | | | | | | | | Card emulation - DO NOT MERGE" into eclair Merge commit '720b75ff159c33b0e939a0b1d67c7d103443b57c' * commit '720b75ff159c33b0e939a0b1d67c7d103443b57c': Revert previous patch to fix SD Card emulation - DO NOT MERGE
| * am 6c77585b: Merge "Revert previous patch to fix SD Card emulation - DO NOT ↵David Turner2010-02-0518-538/+47
| |\ | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into eclair Merge commit '6c77585b906e7eedb878f39870c2b9757bcdd74c' into eclair-plus-aosp * commit '6c77585b906e7eedb878f39870c2b9757bcdd74c': Revert previous patch to fix SD Card emulation - DO NOT MERGE
| | * Merge "Revert previous patch to fix SD Card emulation - DO NOT MERGE" into ↵David Turner2010-02-0518-538/+47
| | |\ | | | | | | | | | | | | eclair
| | | * Revert previous patch to fix SD Card emulation - DO NOT MERGEDavid 'Digit' Turner2010-02-0518-538/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch modifies SD Card hardware emulation in a way that is not backwards compatible with previous SDK platform releases. This has the unfortunate effect of making SD Card emulation not work properly when running existing AVDs. Reverting the patch until we get a better one. This change is intended for the eclair branch only.
* | | | am 30749bc2: am 09be4075: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '30749bc2c008fd515643b222d04bdf2e1b943e44' * commit '30749bc2c008fd515643b222d04bdf2e1b943e44': android-2.1_r1 snapshot
| * | | am 09be4075: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '09be40754c824faece056e79e8dc60db10c4ef16' into eclair-plus-aosp * commit '09be40754c824faece056e79e8dc60db10c4ef16': android-2.1_r1 snapshot
| | * | reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\ \ | | | |/ | | |/|
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\
| | | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-1211-42/+403
| | | | |
* | | | | am d9b8b90d: merge from open-source masterThe Android Open Source Project2010-01-271-1/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9' * commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9': Force gcc-4.0 for qemu build on Mac OS X
| * | | | 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
* | | | | | am 0edf6fb4: am 1cb37b34: Add new -sdcard2 <file> option. Add support for ↵David 'Digit' Turner2010-01-081-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD in the standalone build system. Merge commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1' * commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1': Add new -sdcard2 <file> option.
| * | | | | am 1cb37b34: Add new -sdcard2 <file> option. Add support for FreeBSD in the ↵David 'Digit' Turner2010-01-0812-45/+376
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standalone build system. Merge commit '1cb37b34f117f72bb16de23f42ba6885e729d85c' into eclair-plus-aosp * commit '1cb37b34f117f72bb16de23f42ba6885e729d85c': Add new -sdcard2 <file> option.
| | * | | | Add new -sdcard2 <file> option.David 'Digit' Turner2010-01-0718-47/+538
| | | | | | | | | | | | | | | | | | | | | | | | Add support for FreeBSD in the standalone build system.
* | | | | | am 538b0138: am c973b058: Add support to the emulator\'s standalone build ↵David 'Digit' Turner2010-01-073-0/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system for C++ sources. Merge commit '538b01383c3f202aa7822ab9cae01c4d1abe2c08' * commit '538b01383c3f202aa7822ab9cae01c4d1abe2c08': Add support to the emulator's standalone build system for C++ sources.
| * | | | | 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
| | | |/ / | | |/| |
* | | | | Merge commit 'goog/eclair-plus-aosp'Android Git Automerger2009-12-150-0/+0
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2024-06-23 19:33:41 +0000