commit 57c2f0ed82a4c8d9a0bb526177c1ceb525d7a3c4
author Jim Kaye <jameskaye@google.com> Sat Aug 01 00:10:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 01 00:10:34 2015 +0000
tree ba1c1e5d52488e323bd8295956008e873aa44e14
parent 02018f8babe7be237dc9f80f93edbe32a8de47e3
parent dae80430f9fc492f5751cc390365ae382594b841

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

* commit 'dae80430f9fc492f5751cc390365ae382594b841':
  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;