diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-22 19:45:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-22 19:45:29 +0000 |
| commit | 027db6a6bb00ac76078b922d66e04e324a113064 (patch) | |
| tree | 66fff11fcc74a4a0e9a3d71ff76ddc8be1b2df11 | |
| parent | adf3d1bd694f69bd92850a906a5beb870eab1394 (diff) | |
| parent | 45af44f2ed3a08732249595209d5ac1be7a291bc (diff) | |
| download | android-emulator-027db6a6bb00ac76078b922d66e04e324a113064.tar.gz | |
Panic with emulating x86_64 without KVM or HAXM
automerge: 45af44f
* commit '45af44f2ed3a08732249595209d5ac1be7a291bc':
Panic with emulating x86_64 without KVM or HAXM
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | darwin-x86_64/emulator64-arm | bin | 2941952 -> 2941952 bytes | |||
| -rwxr-xr-x | darwin-x86_64/emulator64-mips | bin | 2869988 -> 2874092 bytes | |||
| -rwxr-xr-x | darwin-x86_64/emulator64-x86 | bin | 3040356 -> 3040396 bytes | |||
| -rwxr-xr-x | linux-x86_64/emulator64-x86 | bin | 2762896 -> 2763248 bytes |
5 files changed, 1 insertions, 1 deletions
@@ -11,6 +11,6 @@ path of this AOSP repo workspace. Below is the list of specific commits for each input directory used: external/gtest e8981d1 Add LOCAL_MULTILIB := both for host targets. -external/qemu 965a6e0 Parse fstab.goldfish file from ramdisk.img +external/qemu 5a11371 Merge "Warn/Panic with x86_64 emulation without CPU acceleration." sdk/emulator/opengl 1af0da2 Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133 automerge: 343a78f diff --git a/darwin-x86_64/emulator64-arm b/darwin-x86_64/emulator64-arm Binary files differindex ccb29be..b3e0f09 100755 --- a/darwin-x86_64/emulator64-arm +++ b/darwin-x86_64/emulator64-arm diff --git a/darwin-x86_64/emulator64-mips b/darwin-x86_64/emulator64-mips Binary files differindex 3b98384..7389d28 100755 --- a/darwin-x86_64/emulator64-mips +++ b/darwin-x86_64/emulator64-mips diff --git a/darwin-x86_64/emulator64-x86 b/darwin-x86_64/emulator64-x86 Binary files differindex b38eadc..0e154ca 100755 --- a/darwin-x86_64/emulator64-x86 +++ b/darwin-x86_64/emulator64-x86 diff --git a/linux-x86_64/emulator64-x86 b/linux-x86_64/emulator64-x86 Binary files differindex c9e3d73..526865e 100755 --- a/linux-x86_64/emulator64-x86 +++ b/linux-x86_64/emulator64-x86 |