aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge "Provide GL strings from renderer to ddms ping"Jesse Hall2012-05-035-26/+132
|\ \
| * | Provide GL strings from renderer to ddms pingJesse Hall2012-05-015-26/+132
| | | | | | | | | | | | Change-Id: I59c9e58c568a70855783e57514fec80b711d6a64
* | | Fixed compilation error with new x86_64-w64-mingw32 compilerAndrew Hsieh2012-05-026-39/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the following for the new compiler 1. android/camera/camera-capture-windows.c: Added "#include <windows.h>" 2. SetClassLong() is deprecated. GCL_HICON doesn't exist in _WIN64. Replacted it with SetClassLongPtr(h, GCLP_HICON, icon) 3. [v]asprintf now actually exisit in libray. Changed the prototype to match the standard ones but will remove them later for GCC 4.5 and up. 4. Renamed _set_errno to set_errno because it exists in stdlib.h. Renamed _fix_errno to fix_errno for consistency. 5. EAI_NODATA and EAI_NONAME become the same things. 6. ddk/*h don't exisit. tap-win32.c actually only needs winioctl.h which provide constants. I have make sure they got the same constants in both old and new mingw compilers 7. #undef DELETE before redefining it for KEY_CODE in hw-events.h because DELETE is defined to be a constant in standard header. The above don't break the old one (ie. /usr/bin/i586-mingw32msvc-*) Change-Id: Ic7d13fd0fd237d433f923ee01c6ce50f5c02f095
* | | Fixed emulator fails to load lib*GL when launched from its own directoryAndrew Hsieh2012-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | When emulator is lunched from its own directory (ie. cd out/*/bin; ./emulator), emulator fails to locate shared libraries lib*GL at out/*/lib because utility function path_parent(".", 1) incorrectly returns NULL instead of "..". Fixed that case. Change-Id: I86f8e5d655107ae8cd2237d59518180ce6e69c53
* | | Fixed pc-bios path in standalone emulatorAndrew Hsieh2012-05-021-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | pc-bios was recently moved to new directory. Change emulator to search in new path in standalone mode (built in external/qemu and run from external/qemu/objs). To be specific, change ../../../prebuilt/common/pc-bios/ to ../../../prebuilts/qemu-kernel/x86/pc-bios/ Change-Id: Id79534349394c9b47f8ef5dda76f2a21268b58fe
* | Merge "Fix adb client protocol"Vladimir Chtchetkine2012-04-301-9/+35
|\ \
| * | Fix adb client protocolVladimir Chtchetkine2012-04-301-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are cases when 'accept' message that guest adbd sends via qemu pipe to the emulator get broken into pieces: once 4 bytes are delivered, and then the remaining two. This breaks the protocol, as emulator assumes that all 6 bytes would be delivered in one chunk. This CL adjusts that by accumulating messages in a buffer, and analyzing them only when collected message length reaches certain point. Change-Id: Ice25625f65bbaa2b07677c3285bf75e7bf46fbb7
* | | Fix Windows buildVladimir Chtchetkine2012-04-302-2/+6
|/ / | | | | | | Change-Id: I732fa0d756656ad9976eddd06b16644e208aa512
* | Use new SdkController communication protocol for emulation portsVladimir Chtchetkine2012-04-3016-2755/+1626
| | | | | | | | | | | | | | | | | | | | | | | | | | | | android/sdk-control-socket.* has replaced android/android-device.* as the back-bone of communicating with SDK controller on the device. The major differences are: - New communication protocol uses just one (async) socket connection to communicate with the device (the old one used two sockets: one sync, and another - async). - New communication protocol connects to one TCP port (1970 in this CL) for all emulation ports. Channel multiplexing is done by using port names, and assigning a separate socket for communication inside each separate port. The old protocol had separate TCP ports for each emulation ports (1968 for sensors, and 1969 for multi-touch) Change-Id: I779fcbdfba2f9b4c433a9d76a567975708b00469
* | Add an option to set custom size for cache partitionVladimir Chtchetkine2012-04-303-0/+22
| | | | | | | | Change-Id: I1be43697ee04f46c5839c4d23e461d54eefc450f
* | Merge "Allow BUILD_HOST_static to build statically-linked emulator"Andrew Hsieh2012-04-282-2/+6
|\ \
| * | Allow BUILD_HOST_static to build statically-linked emulatorAndrew Hsieh2012-04-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statically linked emulator is easy to setup in sandboxed environment. With this and BUILD_HOST_static in build/ (seperate CL), statically-linked SDK tools can be built with the following command BUILD_HOST_static=1 make PRODUCT-sdk-aapt adb aidl dexdump fastboot \ llvm-rs-cc dmtracedump emulator emulator-arm emulator-x86 \ etc1tool hprof-conv mksdcard sqlite3 zipalign No need to build HW GL libraries (libOpenglRender, libGLES_CM_translator, libGLES_V2_translator and libEGL_translator) because statically-linked emulator doesn't support audio and graphics. (eg. -no-window) Change-Id: I209287a00f66295b8b8135451025428f03776a1a
* | | Merge "Fix standalone emulator build."Jesse Hall2012-04-278-8/+58
|\ \ \ | |/ / |/| |
| * | Fix standalone emulator build.Jesse Hall2012-04-268-8/+58
|/ / | | | | | | | | | | | | | | | | | | - Allow building with OpenGL ES acceleration disabled, avoiding a dependency on stuff outside the QEMU project. - Allow the standalone configure.sh to provide the include/lib path for the OpenGL ES libraries. - Update the default OpenGL ES include path for standalone builds. Change-Id: I03f4627af4c271783b65a116ceb5934385c68cdc
* | Merge "Rename a declaration to fix Mac SDK build"Jesse Hall2012-04-262-4/+4
|\ \
| * | Rename a declaration to fix Mac SDK buildJesse Hall2012-04-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | GCC on OS X is flagging a duplicate declaration error even though GCC on Linux isn't even warning about it. Not sure why. The declaration is duplicated, but identical. Renaming one of the two. Change-Id: I946b5f3a4e410b66e9ab2ae3160ff1bec4e0ddd7
* | | Merge "Add qemu pipe access with parameter"Andrew Hsieh2012-04-252-2/+61
|\ \ \ | |/ / |/| |
| * | Add qemu pipe access with parameterJiang, Yunhong2012-04-072-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following changes are crucial for GPU H/W acceleration because some graphics applications like games perform very frequent QEMU pipe operations to send GLES commands to the host translator. For each read/write buffer operation, currently QEMU pipe requires five MMIO operations. This causes significant overhead when running with hardware virtualization enabled (e.g. HAXM) because each MMIO causes expensive transition from the guest kernel to the kernel driver, and to the QEMU user space in the end. Among such five MMIO accesses, four of them are required to just set up the parameters for the access, like the buffer address, length etc. By passing a buffer containing such parameters, we need only one MMIO operation to send a GLES command to the host translator. Update the qemu_pipe save version for pipe struct changes. Change-Id: Idf6400f3c4c9c8473311312bb1d8f3ea92d68797 Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com> Signed-off-by: Nakajima, Jun <jun.nakajima@intel.com>
* | | Merge "Publish and use libOpenglRender interface header"Jesse Hall2012-04-255-41/+35
|\ \ \
| * | | Publish and use libOpenglRender interface headerJesse Hall2012-04-185-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator opengles.c file duplicated the function declarations from libOpenglRenderer's render_api.h instead of including it directly. This led to multiple bugs since the declarations didn't actually match, but there was no way for the compiler or dynamic loader to check this. This change makes opengles.c include render_api.h to get function pointer prototypes, and changes the prototypes/implementation as necessary to make both sides actually match. It should be much more difficult to introduce interface mismatch bugs now. Two bugs this change would have prevented: (a) The interface mismatch caused by inconsistent branching which led to GPU acceleration crashing on Windows. With this change, we would have caught the problem at compile time. (b) The emulator verbose log has always been printing "Can't start OpenGLES renderer?" even when the renderer started fine. This is because the renderer was returning a bool (true == success) but the emulator's declaration said it returned int, and the emulator assumed 0 meant success. This difference in return type should now be caught at compile time. Change-Id: I5b3c70c9a40854332d67e37333acd6edb6ad01f6
* | | | am 62c93bea: Merge "[MIPS] Tweak MIPS support to work in Android qemu framework"Andrew Hsieh2012-04-244-9/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '62c93beade8ef5bcb0083f387d62f65259d42675': [MIPS] Tweak MIPS support to work in Android qemu framework
| * \ \ \ Merge "[MIPS] Tweak MIPS support to work in Android qemu framework"Andrew Hsieh2012-04-194-9/+92
| |\ \ \ \
| | * | | | [MIPS] Tweak MIPS support to work in Android qemu frameworkBhanu Chetlapalli2012-01-314-9/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd617cb91fe87a6f88566dd57b6405b216ca3570 Signed-off-by: Chris Dearman <chris@mips.com>
* | | | | | am e84f9719: Merge "[MIPS] Import MIPS target support"Andrew Hsieh2012-04-2416-0/+19608
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e84f9719ebba640447b6839378e21711d8387b8f': [MIPS] Import MIPS target support
| * | | | | Merge "[MIPS] Import MIPS target support"Andrew Hsieh2012-04-1916-0/+19608
| |\ \ \ \ \ | | |/ / / /
| | * | | | [MIPS] Import MIPS target supportBhanu Chetlapalli2012-01-3116-0/+19608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From v0.12.5 tag at git://git.sv.gnu.org/qemu.git CommitID: 174f225e9d62e8f3002e274e4f718bd2a967fbf4 Change-Id: I35b49a4319cee4b69cf9da4e5af1f43327e21056 Signed-off-by: Chris Dearman <chris@mips.com>
* | | | | | am b7d13b6f: Merge "[ENDIAN] Fix goldfish fb for bigendian targets"Andrew Hsieh2012-04-241-6/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b7d13b6fae601be9b19dbd24a46f2a06491a6a26': [ENDIAN] Fix goldfish fb for bigendian targets
| * | | | | Merge "[ENDIAN] Fix goldfish fb for bigendian targets"Andrew Hsieh2012-04-191-6/+15
| |\ \ \ \ \
| | * | | | | [ENDIAN] Fix goldfish fb for bigendian targetsBhanu Chetlapalli2012-01-311-6/+15
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap bytes in the display buffer if the host endianess does not match the target endianess. This fixes a problem with the wrong colour being displayed in the text framebuffer console. Not sure if the is the correct place to fix it.. It might be better to have the kernel goldfish framebuffer driver swap the bytes. Change-Id: I8c7ada6e5cb6de7745511f3b83f07f0ac95276af Signed-off-by: Chris Dearman <chris@mips.com>
* | | | | | am c135d75d: Merge "Reword -help-gpu text for clarity and accuracy"Jesse Hall2012-04-241-8/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c135d75d5ae774d7349f1cf346eee03072047179': Reword -help-gpu text for clarity and accuracy
| * | | | | Merge "Reword -help-gpu text for clarity and accuracy"Jesse Hall2012-04-191-8/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Reword -help-gpu text for clarity and accuracyJesse Hall2012-04-181-8/+10
| |/ / / / | | | | | | | | | | | | | | | Change-Id: If950c52919039e85874fefe3415e59aa8ec02c96
* | | | | Merge "Fix skin issue when launching emulator from tree."Xavier Ducrohet2012-04-193-2/+21
|\ \ \ \ \
| * | | | | Fix skin issue when launching emulator from tree.Xavier Ducrohet2012-04-193-2/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When launching the emulator with just -skin from the dev tree the fake AVD was not using the hardware.ini config from the skin due to creating it before resolving skinDir and skinName from the command line options. This change updates the AVD after doing so. Change-Id: Ia0912d72775e26f080f763b29629a3691c253c43
generated by cgit v1.1 at 2025-08-04 14:28:35 +0000