diff options
| author | Jim Kaye <jameskaye@google.com> | 2015-08-01 00:35:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-01 00:35:44 +0000 |
| commit | a7c579bdcbe2543472535718d3b637cb864f6f36 (patch) | |
| tree | 05ee130c494f87c792f85a4a18124dae1b7c25d1 | |
| parent | c3b94166cee683d2b095bc9540cbf1176b881757 (diff) | |
| parent | 57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4 (diff) | |
| download | qemu-master.tar.gz | |
Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-dev automerge: dae8043HEADmastermain
automerge: 57c2f0e
* commit '57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4':
Resolving a kernel-panic in windows arm executables.
| -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; |