aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-248-1211/+1072
| | | | | | | | | | | | 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
* Merge "Remove android/main-ui.c"David 'Digit' Turner2011-02-237-1107/+278
|\
| * Remove android/main-ui.cDavid 'Digit' Turner2011-02-237-1107/+278
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Remove target-specific hard-coded macro."David 'Digit' Turner2011-02-231-8/+74
|\ \ | |/
| * Remove target-specific hard-coded macro.David 'Digit' Turner2011-02-231-8/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the hard-coding of the prebuilt architecture path in android/avd/info.c, in order to build a single version of this source that can work with any supported architectures. NOTE: The target architeture is only useful in the case of the Android build system. We check the target arch by parsing $ANDROID_PRODUCT_OUT/system/build.prop and look for a line that looks like: ro.product.cpu.abi=<abi> Change-Id: I4e573343fa532e66eb034c895a5759754f2d1aef
* | Merge "Minor cleanups for core/ui Makefile separation."David 'Digit' Turner2011-02-2319-86/+23
|\ \ | |/
| * Minor cleanups for core/ui Makefile separation.David 'Digit' Turner2011-02-2319-86/+23
|/ | | | | | | | | | | | | | | | This patch contains minor cleanups that will be needed by a few future patches that will improve the way core and ui sources are separated and built. - remove a few compiler warnings - formatting - remove the memcheck CONFIG_MEMCHECK checks (they later get in the way) - refine hw/hw.h inclusion's of cpu.h (this comes from upstream) - add missing definitions for PRUd64 and PRUx64 (used later) - remove CONFIG_SHAPER test, replace with CONFIG_ANDROID instead. - add missing strdup() calls. Change-Id: Ic7d6681a51af718c298f0ee4bd884b1d8750f28e
* Merge "x86: Add the SSSE3 feature to CPU emulation. Gcc can emit SSSE3 ↵David Turner2011-02-231-1/+1
|\ | | | | | | instructions for optimization purposes."
| * x86: Add the SSSE3 feature to CPU emulation. Gcc can emit SSSE3Jun Nakajima2011-02-101-1/+1
| | | | | | | | | | | | | | | | instructions for optimization purposes. Change-Id: I33ece4f4655d50cbee7fc536ec1ac09218c0ad13 Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | Merge "Stuff hardware configuration with paths to image / partition files"Vladimir Chtchetkine2011-02-226-892/+705
|\ \
| * | Stuff hardware configuration with paths to image / partition filesVladimir Chtchetkine2011-02-226-892/+705
|/ / | | | | | | Change-Id: Id26cd578fc3faf1fee1a55f4999c3613e47c0e96
* | Merge "Fixing the standalone build of the emulator."David Turner2011-02-224-4/+5
|\ \
| * | Fixing the standalone build of the emulator.Stefan Hilzinger2011-02-224-4/+5
|/ / | | | | | | Change-Id: I81567b512df04314d87dd3846b02d8895829937d
* | Merge "Enabled the camera button in the emulator"David Turner2011-02-211-0/+1
|\ \
| * | Enabled the camera button in the emulatorsoledad penades2011-02-191-0/+1
|/ / | | | | | | Change-Id: I1587d5e6ccc0bf092bb38b2c841eb19cb006f2e7
* | merge from tools_r10The Android Open Source Project2011-02-172-0/+6
|\ \ | | | | | | | | | Change-Id: I8730ebf34c07bf1a5167970ee1fdce4fb3094c54
| * \ Merge "Merge 59e8e196 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-168-20/+49
| |\ \
| | * | Merge 59e8e196 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-168-20/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hw.keyboard.lid This is used to control the lid switch virtual device. + Add support for a "version <number>" field to the skin format. This will later be used for skin format #3. + Fix a bug where string hw properties didn't work/compile Change-Id: I27ff3293b439917a51c584a25139264ddb1aff12
| * | Merge "Fix "avd name" bug." into tools_r10David 'Digit' Turner2011-02-162-0/+6
| |\ \
| | * | Fix "avd name" bug.David 'Digit' Turner2011-02-172-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console's 'avd name' command returned "unknown" incorrectly. This was due to a missing option when invoking the core, even in the standalone case. Fixes bug 3454261 Change-Id: I7efcfc50792231f57dc76d3c11e7968faf057e12 NOTE: This is a quick fix for tools_r10. A proper fix should instead move the AVD name to auto-generated qemu-hardware.ini instead of using a core command-line option.
| * | Merge "Merge 593d0ea0 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-151-5/+7
| |\ \
| | * | Merge 593d0ea0 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-151-5/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hw-sensors.c: Reduce default delay between sensor updates. This reduces the default delay used between sensor updates. This is needed to fix orientation for Honeycomb emulation since the framework's window orientation listener now discards events if they are spaced by more than 1 second (which happened to be the old default). Change-Id: I4a29bc6f905ca048aa8b753130a7a1711c3a79f3
* | | Merge "Fix the windows SDK build."David 'Digit' Turner2011-02-161-1/+1
|\ \ \
| * | | Fix the windows SDK build.David 'Digit' Turner2011-02-171-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Use "qemu-queue.h" instead of <sys/queue.h> which may not be provided with all version of mingw on Linux. Change-Id: I78492f6e0ab5648a61b1fe65376edb17e4cb89cd
* | | Merge "Add user mode networking restrictions: a firewall"David Turner2011-02-168-34/+898
|\ \ \
| * | | Add user mode networking restrictions: a firewallrich cannings2011-02-168-34/+898
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command line options added and code is supported for: QEMU_OPTION_drop_udp QEMU_OPTION_drop_tcp QEMU_OPTION_allow_tcp QEMU_OPTION_drop_log QEMU_OPTION_net_forward QEMU_OPTION_max_dns_conns QEMU_OPTION_allow_udp QEMU_OPTION_dns_log Also, this change makes the default max DNS connections unlimited. Change-Id: I887213149956dda155ef514418365bd80d8f1236
* | | Merge "hw-sensors.c: Reduce default delay between sensor updates."Xavier Ducrohet2011-02-151-5/+7
|\ \ \ | |_|/ |/| |
| * | hw-sensors.c: Reduce default delay between sensor updates.David 'Digit' Turner2011-02-151-5/+7
|/ / | | | | | | | | | | | | | | | | | | This reduces the default delay used between sensor updates. This is needed to fix orientation for Honeycomb emulation since the framework's window orientation listener now discards events if they are spaced by more than 1 second (which happened to be the old default). Change-Id: I9194d93ab445302df1d887473b6ff5c446e13f98
* | Merge "Add hw.keyboard.lid"David 'Digit' Turner2011-02-108-20/+49
|\ \
| * | Add hw.keyboard.lidDavid 'Digit' Turner2011-02-108-20/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to control the lid switch virtual device. + Add support for a "version <number>" field to the skin format. This will later be used for skin format #3. + Fix a bug where string hw properties didn't work/compile Change-Id: I678a0988d2cd24169dd0c2ece96e7ab0b2822104
* | | Merge "Correct auto-detection of default VM heap size."David 'Digit' Turner2011-02-108-58/+69
|\ \ \ | |/ /
| * | Correct auto-detection of default VM heap size.David 'Digit' Turner2011-02-108-58/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the need for the -m <memory> core option. Instead, the RAM size is taken by default from qemu-hardware.ini. Also, the default value of vm.heapSize is no longer 16MB, it is now adjusted based on the RAM size (16/32/48 values) + Get rid of core -lcd-density option (use .ini file instead) Change-Id: I93919926b61a132c7943a1bb2c41f7a3ab7f2d2f
* | | Merge "Get rid of -android-gui core option."David 'Digit' Turner2011-02-108-82/+118
|\ \ \ | |/ /
| * | Get rid of -android-gui core option.David 'Digit' Turner2011-02-108-82/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, pass all LCD configuration in qemu-hardware.ini. + Make the latter file mandatory to launch a core. You can easily generate one by launching "emulator <options>" though. Change-Id: I81a1938217562517e4c2bbb828aef934033c29a5
* | | Merge "Write the core hardware configuration file to AVD's content directory."David 'Digit' Turner2011-02-104-39/+64
|\ \ \ | |/ /
| * | Write the core hardware configuration file to AVD's content directory.David 'Digit' Turner2011-02-104-39/+64
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Do not write the core's hardware configuration file to a temporary file. Instead, stored it under the AVD's content directory with the name qemu-hardware.ini. For platform builds, use $ANDROID_PRODUCT_OUT/qemu-hardware.ini The purpose of this auto-generated file is to contain all hardware configuration required to properly launch a core from the UI. Further patches will get rid of special core command-line options (e.g. -android-gui) and rely on the content of this file, by adding new hw properties. Change-Id: Id761151c8c8990f1cfa7380779b720080f49469f
* | Merge "Revert "Build arm and x86 binaries at the same time.""Xavier Ducrohet2011-02-0931-1134/+1321
|\ \
| * | Revert "Build arm and x86 binaries at the same time."Xavier Ducrohet2011-02-0931-1134/+1321
|/ / | | | | | | | | | | This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
* | Merge "Build arm and x86 binaries at the same time."David 'Digit' Turner2011-02-0931-1321/+1134
|\ \
| * | Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-1031-1321/+1134
| |/ | | | | | | Change-Id: I105c5a097c988cb964b47b40b71c7a08af0d9210
* | Merge ""Negative" DNS IP address fix"David Turner2011-02-091-1/+1
|\ \ | |/ |/|
| * "Negative" DNS IP address fixrich cannings2011-02-091-1/+1
|/ | | | | | | | | | The DNS server IP is stored in a 32-bit signed int. Thus, no IP address beyond 128.0.0.0 was allowed to be set as DNS server. This change allows for DNS servers to have any IP addresses, except 255.255.255.255 (equivalent to -1 in a 32-bit signed int). Change-Id: I367f46a1de578b0cd123f14f564685c4564aab4e
* Merge "Rename emulator_config_xxx to user_config_xxx"David 'Digit' Turner2011-02-094-10/+10
|\
| * Rename emulator_config_xxx to user_config_xxxDavid 'Digit' Turner2011-02-094-10/+10
|/ | | | Change-Id: Icfcef72a02e388f2aa87b97f004ed43715fc9f30
* Merge "emulator: Fix -no-window flag"David 'Digit' Turner2011-02-091-0/+2
|\
| * emulator: Fix -no-window flagDavid 'Digit' Turner2011-02-091-0/+2
| | | | | | | | Change-Id: Ibb06b7d412faeafa717de6d095a9eaae84d35ab4
* | Merge "android-configure.sh: Fix --cc=<compiler> option."David 'Digit' Turner2011-02-096-8/+42
|\ \ | |/
| * android-configure.sh: Fix --cc=<compiler> option.David 'Digit' Turner2011-02-096-8/+42
| | | | | | | | | | | | | | | | + Fix LOCAL_GENERATED_SOURCES handling + Fix missing library dependencies for executables + Move generated library files to objs/libs/ (instead of objs/) Change-Id: If3ebaa7ae856efa9bd3ff9e2c199389989db7f71
* | Merge "elff: Remove un-needed qemu-common.h include."David 'Digit' Turner2011-02-096-30/+13
|\ \ | |/
| * elff: Remove un-needed qemu-common.h include.David 'Digit' Turner2011-02-096-30/+13
| | | | | | | | | | | | | | The elff library doesn't really depend on anything QEMU-specific. This will allow us to use it in other projects later. Change-Id: I662b6e864b320cd9cf2fe246d04fbba95be66c56