Merge "Warn/Panic with x86/64 emulation without KVM/HAXM" into idea133ub-tools-idea133-releaseidea133

1 files changed, 5 insertions, 5 deletions

diff --git a/android/main.c b/android/main.c
index a5b479a12a..0182a413b4 100755
--- a/android/main.c
+++ b/android/main.c
@@ -1301,23 +1301,23 @@ int main(int argc, char **argv)
         dprint("CPU Acceleration status: %s", accel_status);
     }
 
-    // Special case: x86_64 emulation currently requires hardware
+    // Special case: x86/x86_64 emulation currently requires hardware
     // acceleration, so refuse to start in 'auto' mode if it is not
     // available.
     {
         char* abi = avdInfo_getTargetAbi(avd);
-        if (!strcmp(abi, "x86_64")) {
+        if (!strncmp(abi, "x86", 3)) {
             if (!accel_ok && accel_mode != ACCEL_OFF) {
-                derror("x86_64 emulation currently requires hardware acceleration!\n"
+                derror("%s emulation currently requires hardware acceleration!\n"
                     "Please ensure %s is properly installed and usable.\n"
                     "CPU acceleration status: %s",
-                    kAccelerator, accel_status);
+                    abi, kAccelerator, accel_status);
                 exit(1);
             }
             else if (accel_mode == ACCEL_OFF) {
                 // '-no-accel' of '-accel off' was used explicitly. Warn about
                 // the issue but do not exit.
-                dwarning("x86_64 emulation may not work without hardware acceleration!");
+                dwarning("%s emulation may not work without hardware acceleration!", abi);
             }
         }
         AFREE(abi);