Bug 1187124 - Refer to $ANDROID_VERSION "... -ge 18" only when it is a non-empty string. r=gps
authorISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
Thu, 23 Jul 2015 16:47:00 +0200
changeset 287787 dcb9d39d3ee8c483a85b6b9a29d92be71a3d17d9
parent 287786 e8ebb2e71f5eefea170b69cf2cf562a099117fc8
child 287788 ce5feaa287a0006e1a4845c26a8881e164d0dc95
push id934
push userraliiev@mozilla.com
push dateMon, 26 Oct 2015 12:58:05 +0000
treeherdermozilla-release@05704e35c1d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1187124
milestone42.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 1187124 - Refer to $ANDROID_VERSION "... -ge 18" only when it is a non-empty string. r=gps
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5384,20 +5384,24 @@ if test -n "$MOZ_FFMPEG" -a -z "$MOZ_FMP
     AC_MSG_ERROR([Fragmented MP4 support must be enabled if using FFMPEG])
 fi
 
 if test -n "$MOZ_FMP4"; then
     AC_DEFINE(MOZ_FMP4)
     MOZ_EME=1
 fi;
 
-if test "$MOZ_WIDGET_TOOLKIT" = "gonk" -a -n "$MOZ_FMP4" -a "$ANDROID_VERSION" -ge "18"; then
-    MOZ_GONK_MEDIACODEC=1
-    AC_SUBST(MOZ_GONK_MEDIACODEC)
-fi
+if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$ANDROID_VERSION"; then
+    # we now know for sure that $ANDROID_VERSION is not an empty string!
+    if test "$ANDROID_VERSION" -ge "18"; then
+        MOZ_GONK_MEDIACODEC=1
+        AC_SUBST(MOZ_GONK_MEDIACODEC)
+    fi
+fi
+
 
 dnl ========================================================
 dnl = EME support
 dnl ========================================================
 
 MOZ_ARG_ENABLE_STRING(eme,
 [  --enable-eme[=adobe]  Enable support for Encrypted Media Extensions  ],
     MOZ_EME_ARGS=$enableval)