Bug 1228256 - Move AC_DEFINE(ANDROID) in an Android-specific code-path. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 26 Nov 2015 17:31:06 +0900
changeset 274397 4bd763798dbf7e49da5f17bc48c5de7e3d1487c3
parent 274396 247bfa7ed091c2188e496fb95f6267535f017a48
child 274398 3c376f3b77e414da3196c9697d3df2d5b9186294
push id68567
push usermh@glandium.org
push dateThu, 26 Nov 2015 22:54:31 +0000
treeherdermozilla-inbound@4bd763798dbf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1228256
milestone45.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 1228256 - Move AC_DEFINE(ANDROID) in an Android-specific code-path. r=nalexander
configure.in
--- a/configure.in
+++ b/configure.in
@@ -319,27 +319,26 @@ if test -n "$gonkdir" ; then
     AC_DEFINE(HAVE_SYS_UIO_H)
     AC_DEFINE(HAVE_PTHREADS)
     MOZ_CHROME_FILE_FORMAT=omni
     direct_nspr_config=1
     android_cxx_stl=mozstlport
 else
     if test "$COMPILE_ENVIRONMENT"; then
         MOZ_ANDROID_NDK
-    else
-        AC_DEFINE(ANDROID)
     fi # COMPILE_ENVIRONMENT
 
     case "$target" in
     *-android*|*-linuxandroid*)
         if test -z "$ANDROID_PACKAGE_NAME" ; then
             ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
         fi
         MOZ_CHROME_FILE_FORMAT=omni
         ZLIB_DIR=yes
+        AC_DEFINE(ANDROID)
         ;;
     *-linux*)
         AC_PATH_PROG(OBJCOPY,objcopy)
         ;;
     esac
 fi
 
 case "$target" in