commit a7c579bdcbe2543472535718d3b637cb864f6f36
author Jim Kaye <jameskaye@google.com> Sat Aug 01 00:35:44 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 01 00:35:44 2015 +0000
tree 05ee130c494f87c792f85a4a18124dae1b7c25d1
parent c3b94166cee683d2b095bc9540cbf1176b881757
parent 57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4

Merge "Resolving a kernel-panic in windows arm executables." into studio-1.4-dev automerge: dae8043
automerge: 57c2f0e

* commit '57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4':
  Resolving a kernel-panic in windows arm executables.

android/main-emulator.c

diff --git a/android/main-emulator.c b/android/main-emulator.c
index ddcf306..595928c 100644
--- a/android/main-emulator.c
+++ b/android/main-emulator.c
@@ -468,6 +468,13 @@
     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;