Merge b-i to m-c
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 25 Oct 2013 19:48:31 -0700
changeset 167059 ef3f5669b53e4b3e85ca33622108ede08d5a608a
parent 167050 0280ef5d685c3a8f72a80ed6df62aad8b9cc709a (current diff)
parent 167058 b6084fd988802f826c47528e44c7f1727577a05b (diff)
child 167060 56fec8ea6d647a3ec86e8a1b6777c6dba86f3968
child 167090 4018b3711bf8983de7338614cff3755ebf8c1f70
child 167096 1daa57b0fe372c184911a0bbb77ed19c569395c4
child 167215 2db069bf99081e67d2678001a7486e36fed60b35
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.0a1
first release with
nightly linux32
ef3f5669b53e / 27.0a1 / 20131026030205 / files
nightly linux64
ef3f5669b53e / 27.0a1 / 20131026030205 / files
nightly mac
ef3f5669b53e / 27.0a1 / 20131026030205 / files
nightly win32
ef3f5669b53e / 27.0a1 / 20131026030205 / files
nightly win64
ef3f5669b53e / 27.0a1 / 20131026030205 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b-i to m-c
configure.in
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "f6bdd9d219b832b059ecc42df53a3882479db9de", 
+    "revision": "7824a49ab738f1f070e746474f5f225a831b1d45", 
     "repo_path": "/integration/gaia-central"
 }
--- a/configure.in
+++ b/configure.in
@@ -229,18 +229,17 @@ if test -n "$gonkdir" ; then
         MOZ_RTSP=1
         ;;
     17|18)
         GONK_INCLUDES="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include"
         if test -d "$gonkdir/external/bluetooth/bluez"; then
           GONK_INCLUDES="$GONK_INCLUDES -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib"
             MOZ_B2G_BT=1
             MOZ_B2G_BT_BLUEZ=1
-        fi
-        if test -d "$gonkdir/external/bluetooth/bluedroid"; then
+        elif test -d "$gonkdir/external/bluetooth/bluedroid"; then
             MOZ_B2G_BT=1
             MOZ_B2G_BT_BLUEDROID=1
         fi
 
         MOZ_B2G_CAMERA=1
         MOZ_OMX_DECODER=1
         AC_SUBST(MOZ_OMX_DECODER)
         ;;