Bug 1203627 - Change search order for finding android emulator; r=ahal

testing/mozbase/mozrunner/mozrunner/devices/android_device.py

@@ -471,26 +471,19 @@ class AndroidEmulator(object):
             var = 'ANDROID_PLATFORM_TOOLS'
 
         found = False
-        # Is exe on PATH?
-        exe_path = find_executable(exe)
-        if exe_path:
-            found = True
-        else:
-            self._log_debug("Unable to find executable on PATH")
 
-        if not found:
-            # Can exe be found in the Android SDK?
-            try:
-                android_sdk_root = os.environ['ANDROID_SDK_ROOT']
-                exe_path = os.path.join(
-                    android_sdk_root, subdir, exe)
-                if os.path.exists(exe_path):
-                    found = True
-                else:
-                    self._log_debug(
-                        "Unable to find executable at %s" % exe_path)
-            except KeyError:
-                self._log_debug("ANDROID_SDK_ROOT not set")
+        # Can exe be found in the Android SDK?
+        try:
+            android_sdk_root = os.environ['ANDROID_SDK_ROOT']
+            exe_path = os.path.join(
+                android_sdk_root, subdir, exe)
+            if os.path.exists(exe_path):
+                found = True
+            else:
+                self._log_debug(
+                    "Unable to find executable at %s" % exe_path)
+        except KeyError:
+            self._log_debug("ANDROID_SDK_ROOT not set")
 
         if not found and self.substs:
             # Can exe be found in ANDROID_TOOLS/ANDROID_PLATFORM_TOOLS?
@@ -507,14 +500,24 @@ class AndroidEmulator(object):
 
         if not found:
             # Can exe be found in the default bootstrap location?
+            mozbuild_path = os.environ.get('MOZBUILD_STATE_PATH',
+                os.path.expanduser(os.path.join('~', '.mozbuild')))
             exe_path = os.path.join(
-                '~', '.mozbuild', 'android-sdk-linux', subdir, exe)
+                mozbuild_path, 'android-sdk-linux', subdir, exe)
             if os.path.exists(exe_path):
                 found = True
             else:
                 self._log_debug(
                     "Unable to find executable at %s" % exe_path)
 
+        if not found:
+            # Is exe on PATH?
+            exe_path = find_executable(exe)
+            if exe_path:
+                found = True
+            else:
+                self._log_debug("Unable to find executable on PATH")
+
         if found:
             self._log_debug("%s found at %s" % (exe, exe_path))
         else: