diff options
| author | Jim Kaye <jameskaye@google.com> | 2015-07-29 19:48:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-29 19:48:28 +0000 |
| commit | 1d9cb4d6c1be4b670adab6114e61e30cd2e898c1 (patch) | |
| tree | 7dc03ef41197eda4fd12156a37350a3449c3a5d1 | |
| parent | 80aa7600ec39dfee713980c57711778bf457ecde (diff) | |
| parent | dae80430f9fc492f5751cc390365ae382594b841 (diff) | |
| download | qemu-studio-master-dev.tar.gz | |
Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-devstudio-master-dev_before_26911779studio-1.5studio-1.4gradle_1.5.0studio-master-dev
automerge: dae8043
* commit 'dae80430f9fc492f5751cc390365ae382594b841':
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; |