aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "Mark gles pipe connected after callback invoked"Andrew Hsieh2012-06-061-2/+16
| |\
| | * Mark gles pipe connected after callback invokedJiang, Yunhong2012-06-011-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the net pipe is mark connected right after initialization through asyncConnector_run invokation. However, asyncConnector_run is intended only invoked when callback through select. In some extrem situation, this will cause the qemu pipe driver begin send buffer before the connection is setup. Change this to be asyncConnector_run usage correct, and sendBuffer will check the connection status. Change-Id: Ib10e72e56e1ed5017fc3654b0fce8cacf484c8f8 Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
| * | Merge "[MIPS] Copy vmlinux to kernel-qemu"Andrew Hsieh2012-06-051-2/+2
| |\ \
| | * | [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>
| * | | Merge "Track started and initialized states separately"Jesse Hall2012-06-051-4/+21
| |\ \ \ | | |/ / | |/| |
| | * | Track started and initialized states separatelyJesse Hall2012-06-051-4/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several OpenGL ES renderer functions are called blindly by the emulator and are supposed to do nothing if the renderer isn't running. They were checking whether the libraries were loaded instead of whether the renderer was started. This causes problems when the renderer is started and then stopped (for stats collection) since the libraries aren't unloaded. Change-Id: Ia6c0d2e5b618ff982b55caf35c38bda9aad30ee1
| * | Merge "fix BUILD_DEBUG_EMULATOR build"Andrew Hsieh2012-05-313-3/+8
| |\ \
| | * | fix BUILD_DEBUG_EMULATOR buildIliyan Malchev2012-06-013-3/+8
| |/ / | | | | | | | | | | | | Change-Id: Ib888b8114d77270383c6ac563fb36bfdaf7b72fc Signed-off-by: Iliyan Malchev <malchev@google.com>
| * | Merge "replace _exit() with exit()"Andrew Hsieh2012-05-314-7/+7
| |\ \ | | |/ | |/|
| | * replace _exit() with exit()Iliyan Malchev2012-06-014-7/+7
| |/ | | | | | | | | | | | | | | | | | | 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>
| * Merge "Fixed prebuilt path and toolchain names"Andrew Hsieh2012-05-302-25/+21
| |\
| | * 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-292-3/+23
| |\
| | * [MIPS] Add MIPS support to build-kernel.shBhanu Chetlapalli2012-05-212-3/+23
| | | | | | | | | | | | | | | | | | 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 "Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot ↵Vladimir Chtchetkine2012-05-211-0/+9
| |\ \ | | | | | | | | | | | | property."
| | * | Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot property.Vladimir Chtchetkine2012-05-181-0/+9
| | | | | | | | | | | | | | | | Change-Id: Ibfd85c3e351caef89ae57630c824255f29f47914
| | | |
| | \ \
| *-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I498e07ca8d4fc3181054e386148b3b3ac41d59c9
| * | | | Merge "Improve FB update protocol."Vladimir Chtchetkine2012-05-153-11/+48
| |\ \ \ \
| | * | | | Improve FB update protocol.Vladimir Chtchetkine2012-05-153-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it turned out, emulator has been sending Fb updates faster than MT handler on the device could process them. This lead to significant screen lag between the emulator and the device. With this CL emulator will not send FB updates to the device until the device has fully proccesed the previous FB update. Change-Id: I9a39e9f358f87d5bd6baaa2617a79e7de59ae99e
| * | | | | Merge "Refresh stale SdkController screen."Vladimir Chtchetkine2012-05-153-1/+24
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Refresh stale SdkController screen.Vladimir Chtchetkine2012-05-153-1/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MT handler gets deactivated, and then activated again, it shows a stale emulator display, since it didn't have a chance to catch up with emulator display updates. This CL ensures that entire emulator display is pushed to the device when MT handler gets activated. Change-Id: I58c1680f50e2af3e6afa0518f6bcaa3ed087638d
| * | | Merge "Check RAM availability before VM is initialized."Vladimir Chtchetkine2012-05-141-0/+26
| |\ \ \
| | * | | Check RAM availability before VM is initialized.Vladimir Chtchetkine2012-05-141-0/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quite often (especially on older XP machines) attempts to allocate large VM RAM is going to fail, and crash the emulator. Since it's failing deep inside QEMU, it's not really possible to provide the user with a meaningful explanation for the crash. So, before initializing VM we should check if QEMU is going to be able to allocate requested amount of RAM, and if not, try to come up with a recomendation. Change-Id: Id6213d50c70f6bd3b32c4df2ded96d8e3013ec40
| * | | Merge "Catch up with OpenGLES API changes."Vladimir Chtchetkine2012-05-111-0/+13
| |\ \ \
| | * | | Catch up with OpenGLES API changes.Vladimir Chtchetkine2012-05-111-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turned out, that OpenGLES framebuffer update callback is expensive, and since it's used rather rarely (since multi-touch emulation is usually off), it's a waste to have that callback always active. So OpenGLES has now an ability to enable / disable framebuffer update callback, and emulator needs to catch up with that change. Change-Id: Iee028ed79f1d9472c3f31bbfbcb5676c4716c34c
| * | | | Merge "Fix --no-gles config, and ease the pain of standalone emulator build"Vladimir Chtchetkine2012-05-112-0/+31
| |\ \ \ \ | | |/ / /
| | * | | Fix --no-gles config, and ease the pain of standalone emulator buildVladimir Chtchetkine2012-05-112-0/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Apparently, emulator build fails when configured with --no-gles option due to missing android_setPostCallback implementation. 2. It's painful to configure standalone emulator build WITH OpenGLES, since it requires explicit using of --gles-include, and --gles-lib when launching android-configure.sh To ease that pain, just use default location for standalone emulator build. Change-Id: I2d9ed56d68a4ab1cb1ec294817f22dca80d33223
| * | | Merge "Fix emulator's UI build"Andrew Hsieh2012-05-111-1/+1
| |\ \ \
| | * | | Fix emulator's UI buildVladimir Chtchetkine2012-05-111-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When building emulator-ui, build fails complaining that android_startOpenglesRenderer implementation doesn't match routine declaration. Fixing that. Change-Id: I5f3f588969c1b4c9a59035f8abddb63cc6c917ad
| * | | Merge "Remove init-time GLES per-frame callback"Jesse Hall2012-05-103-16/+18
| |\ \ \
| | * | | Remove init-time GLES per-frame callbackJesse Hall2012-05-103-16/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLES renderer interface now allows the per-frame callback to be registered after initialization. This change updates the emulator to use the new interface. Since reading back completed frames is slow (due to pipeline flush/stall), a future change will enable the callback only while multitouch emulation is actually in use. Change-Id: I7ad23b4bebe1bd3077863da4d50333cc0578519e
| * | | Merge "Fixed standalone emulator when ANDROID_BUILD_TOP is present"Andrew Hsieh2012-05-072-13/+5
| |\ \ \
| | * | | Fixed standalone emulator when ANDROID_BUILD_TOP is presentAndrew Hsieh2012-05-082-13/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With ANDROID_BUILD_TOP android-configure.sh searches for prebuilt directories later used for locating ccache. At this moment, ccache is located in different location between AOSP and internal tree. Beside, "prebuilt" is gone in internal tree. Change-Id: Ib14b8c91c9f8026605617f2abf94c3bee9ddadb6
| * | | Merge "Use the same compilation options on OS X 10.8 as 10.7"Jean-Baptiste Queru2012-05-071-2/+2
| |\ \ \
| | * | | Use the same compilation options on OS X 10.8 as 10.7Al Sutton2012-05-071-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same linker option for handling dynamic libraries on OS X 10.8 as has been previously used on 10.7 Change-Id: I18860d779a2caa695cf4016da6d2123726b58427 Signed-off-by: Al Sutton <al@funkyandroid.com>
| * | | am 9d26d64c: Merge "Emulator64-mips segfaults, disable it for now."Andrew Hsieh2012-05-061-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '9d26d64c356817e2f320e8aee958012ee6c5bed5': Emulator64-mips segfaults, disable it for now.
| | * \ \ Merge "Emulator64-mips segfaults, disable it for now."Andrew Hsieh2012-05-061-0/+2
| | |\ \ \
| | | * | | Emulator64-mips segfaults, disable it for now.Duane Sand2012-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Duane Sand <duanes@mips.com> Change-Id: I17fe688d19e3cd7f328721e6363bacd6e6689ca2
| * | | | | Merge "Fixed link-error for standalone emulator when CONFIG_ANDROID_OPENGLES ↵Andrew Hsieh2012-05-061-0/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | == 0"
| | * | | | Fixed link-error for standalone emulator when CONFIG_ANDROID_OPENGLES == 0Andrew Hsieh2012-05-041-0/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a fake android_getOpenglesHardwareStrings (called in vl-android.c) when CONFIG_ANDROID_OPENGLES is not set or zero. This happens when ./android-configure.sh can't locate GLES include and libs. Change-Id: I1f99644adcc78b9872d7e9c6e1e7bd7b2a654119
| * | | | Merge "Win SDK: Fix missing emulator icon"Raphael Moll2012-05-043-1/+36
| |\ \ \ \
| | * | | | Win SDK: Fix missing emulator iconRaphael Moll2012-05-043-1/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | History: It had been inadvertedly removed by the makefile reorg done in aff94b88c4ec057f20950d5e7a88b90cc4d97dce. SDK Bug: 21709 Change-Id: Icd147a1edb363e1ccbee2c3cade4ed34beceeeff
| * | | | Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru2012-05-042-2/+10
| |\ \ \ \
| | * | | | Xcode 4.3 compatibility checkinAl Sutton2012-02-222-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 4.3 compiler doesn't have support for global register variables so this patch ensures that the register keyword is not incuded for that compiler. Signed-off-by: Al Sutton <al@funkyandroid.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>
| * | | | Merge "Add dynamic symbol for _XGetRequest, which libX11 1.4.99.1 added"Jesse Hall2012-05-032-0/+30
| |\ \ \ \
| | * | | | 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
generated by cgit v1.1 at 2025-01-23 05:34:28 +0000