Bug 1428110 - Check both paths of EMULATOR in one pass. r=nalexander
authorMatías Zúñiga <matias.nicolas.zc@gmail.com>
Mon, 08 Jan 2018 22:03:10 -0300
changeset 452717 b96fa0adc2b3af934e8ca3098278ee2bc78b1bd2
parent 452716 ed3d5e1ac8629ae1277a07552883e8f0a07e086c
child 452718 c809b916352b3d4056610be28e89dc048d363493
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1428110
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1428110 - Check both paths of EMULATOR in one pass. r=nalexander
build/autoconf/android.m4
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -267,23 +267,19 @@ case "$target" in
         AC_MSG_RESULT([$android_tools])
     else
         AC_MSG_ERROR([You must install the Android tools.  Try |mach bootstrap|.  (Looked for $android_tools)])
     fi
 
     dnl Android Tools 26 changes emulator path.
     dnl Although android_sdk_root/tools still has emulator command,
     dnl it doesn't work correctly
-    MOZ_PATH_PROG(EMULATOR, emulator, :, [$android_sdk_root/emulator])
+    MOZ_PATH_PROG(EMULATOR, emulator, :, [$android_sdk_root/emulator:$android_tools])
     if test -z "$EMULATOR" -o "$EMULATOR" = ":"; then
-        dnl old emulator path until Android Tools 25.x
-        MOZ_PATH_PROG(EMULATOR, emulator, :, [$android_tools])
-        if test -z "$EMULATOR" -o "$EMULATOR" = ":"; then
-            AC_MSG_ERROR([The program emulator was not found.  Try |mach bootstrap|.])
-        fi
+        AC_MSG_ERROR([The program emulator was not found.  Try |mach bootstrap|.])
     fi
 
     # `compileSdkVersion ANDROID_COMPILE_SDK_VERSION` is Gradle-only,
     # so there's no associated configure check.
     ANDROID_COMPILE_SDK_VERSION=$1
     ANDROID_TARGET_SDK="${android_target_sdk}"
     ANDROID_SDK="${android_sdk}"
     ANDROID_SDK_ROOT="${android_sdk_root}"