From 1ec5d85fd18ea71e9ac5ff3287a2290f26fdcb03 Mon Sep 17 00:00:00 2001
From: Justin SB <justin@fathomdb.com>
Date: Fri, 24 Oct 2014 13:28:22 -0700
Subject: [PATCH] Move hasAcceleration to last check; it is the least important

We don't want it to be the first thing we link to on the wiki.

It's also nice if it comes last in the checklist, as it's the most likely thing
for users not to have.
---
 tools/commands-cordova.js | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js
index 6d85515835..0aa30d51db 100644
--- a/tools/commands-cordova.js
+++ b/tools/commands-cordova.js
@@ -2591,26 +2591,6 @@ _.extend(Android.prototype, {
       }
     }
 
-    // (hasAcceleration can also be undefined)
-    var hasAcceleration = self.hasAcceleration();
-    if (hasAcceleration === false) {
-      if (fix) {
-        self.installAcceleration();
-      } else {
-        log && Console.info(Console.fail("Android emulator acceleration is not installed"));
-        log && Console.info("  (The Android emulator will be very slow without acceleration)");
-
-        result.missing.push("haxm");
-
-        // Not all systems can install the accelerator, so don't block
-        // XXX: Maybe we should block the emulator (only); it is unusable without it
-        //result.acceptable = false
-      }
-    } else if (hasAcceleration === true) {
-      // (can be undefined)
-      log && Console.info(Console.success("Android emulator acceleration is installed"));
-    }
-
     if (hasAndroid && hasJava) {
       if (self.isPlatformToolsInstalled()) {
         log && Console.info(Console.success("Found Android Platform tools"));
@@ -2728,6 +2708,26 @@ _.extend(Android.prototype, {
       }
     }
 
+    // (hasAcceleration can also be undefined)
+    var hasAcceleration = self.hasAcceleration();
+    if (hasAcceleration === false) {
+      if (fix) {
+        self.installAcceleration();
+      } else {
+        log && Console.info(Console.fail("Android emulator acceleration is not installed"));
+        log && Console.info("  (The Android emulator will be very slow without acceleration)");
+
+        result.missing.push("haxm");
+
+        // Not all systems can install the accelerator, so don't block
+        // XXX: Maybe we should block the emulator (only); it is unusable without it
+        //result.acceptable = false
+      }
+    } else if (hasAcceleration === true) {
+      // (can be undefined)
+      log && Console.info(Console.success("Android emulator acceleration is installed"));
+    }
+
     return result;
   }
 });