diff options
| author | Jim Kaye <jameskaye@google.com> | 2015-07-29 18:57:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-29 18:57:53 +0000 |
| commit | dae80430f9fc492f5751cc390365ae382594b841 (patch) | |
| tree | 7dc03ef41197eda4fd12156a37350a3449c3a5d1 | |
| parent | 0e04a7cd7ac88ec850a24d15a884a52663ca82d5 (diff) | |
| parent | f9ee3bc0c875dbf35c02521d5fa20f7894579ee1 (diff) | |
| download | qemu-dae80430f9fc492f5751cc390365ae382594b841.tar.gz | |
Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-dev
| -rw-r--r-- | android/main-emulator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/android/main-emulator.c b/android/main-emulator.c index ddcf3065bf..595928c868 100644 --- a/android/main-emulator.c +++ b/android/main-emulator.c @@ -468,6 +468,13 @@ getTargetEmulatorPath(const char* progDir, char* ranchu_result; bool search_for_64bit_emulator = !force_32bit && android_getHostBitness() == 64; +#ifdef _WIN32 + // Using emulator64-arm.exe results in a kernel panic while + // x86/x86_64 emulator executables don't have this issue + if (!strcmp(avdArch, "arm")) { + search_for_64bit_emulator = false; + } +#endif const char* emulatorSuffix; |