Bug 930719 - Pick BlueZ or Bluedroid in config, r=glandium
authorIndrajeet Kumar <ikumar@codeaurora.org>
Fri, 25 Oct 2013 09:54:49 -0700
changeset 167058 b6084fd988802f826c47528e44c7f1727577a05b
parent 167057 dfa66b5c26b6c780df331e313688d048e16180a7
child 167059 ef3f5669b53e4b3e85ca33622108ede08d5a608a
child 167099 a7b3edb88d42589baf7fac546c901ed4f28b3148
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)
reviewersglandium
bugs930719
milestone27.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 930719 - Pick BlueZ or Bluedroid in config, r=glandium
configure.in
--- 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)
         ;;