Bug 1280600: Cleanup Bluetooth config and build scripts, r=glandium
Bluetooth availability depends on available driver; not the base system's
version. This patch separates both. Following other modules, it also moves
search-path setup for BT header files into the affected moz.build scripts.
MozReview-Commit-ID: 2hzjcJVTaLY
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -67,16 +67,22 @@ if CONFIG['MOZ_B2G_BT']:
'bluez/BluetoothHidManager.cpp',
'bluez/BluetoothOppManager.cpp',
'bluez/BluetoothSocket.cpp',
'bluez/BluetoothUnixSocketConnector.cpp'
]
LOCAL_INCLUDES += [
'bluez',
]
+ LOCAL_INCLUDES += [
+ '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
+ 'external/bluetooth/bluez/lib',
+ 'external/dbus',
+ ]
+ ]
DEFINES['MOZ_B2G_BT_BLUEZ'] = True
elif CONFIG['MOZ_B2G_BT_DAEMON']:
SOURCES += [
'bluedroid/BluetoothA2dpManager.cpp',
'bluedroid/BluetoothAvrcpManager.cpp',
'bluedroid/BluetoothDaemonA2dpInterface.cpp',
'bluedroid/BluetoothDaemonAvrcpInterface.cpp',
'bluedroid/BluetoothDaemonCoreInterface.cpp',
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -17,16 +17,21 @@ EXPORTS.mozilla.ipc += [
SOURCES += [
'DBusHelpers.cpp',
'DBusUtils.cpp',
'DBusWatcher.cpp',
'RawDBusConnection.cpp',
]
+if CONFIG['MOZ_B2G_BT_BLUEZ']:
+ LOCAL_INCLUDES += [
+ '%' + '%s/external/dbus' % CONFIG['ANDROID_SOURCE']
+ ]
+
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ENABLE_DBUS']:
CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
--- a/old-configure.in
+++ b/old-configure.in
@@ -110,53 +110,38 @@ if test -n "$gonkdir" ; then
ANDROID_VERSION=15
if test -n "${PLATFORM_SDK_VERSION}"; then
ANDROID_VERSION="${PLATFORM_SDK_VERSION}"
fi
case "$ANDROID_VERSION" in
15)
GONK_INCLUDES="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/ -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib -I$gonkdir/dalvik/libnativehelper/include/nativehelper"
- MOZ_B2G_BT=1
- MOZ_B2G_BT_BLUEZ=1
MOZ_NFC=1
MOZ_B2G_CAMERA=1
MOZ_OMX_DECODER=1
AC_SUBST(MOZ_OMX_DECODER)
MOZ_RTSP=1
MOZ_SECUREELEMENT=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 -I$gonkdir/external/mdnsresponder/mDNSShared"
- 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
- elif test -d "$gonkdir/system/bluetoothd"; then
- MOZ_B2G_BT=1
- MOZ_B2G_BT_DAEMON=1
- fi
-
MOZ_RTSP=1
MOZ_NFC=1
MOZ_B2G_CAMERA=1
MOZ_OMX_DECODER=1
AC_SUBST(MOZ_OMX_DECODER)
MOZ_OMX_ENCODER=1
AC_SUBST(MOZ_OMX_ENCODER)
AC_DEFINE(MOZ_OMX_ENCODER)
MOZ_SECUREELEMENT=1
;;
19)
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 -I$gonkdir/external/mdnsresponder/mDNSShared"
MOZ_B2G_CAMERA=1
- if test -d "$gonkdir/system/bluetoothd"; then
- MOZ_B2G_BT=1
- MOZ_B2G_BT_DAEMON=1
- fi
MOZ_NFC=1
MOZ_RTSP=1
MOZ_OMX_DECODER=1
MOZ_OMX_ENCODER=1
AC_DEFINE(MOZ_OMX_ENCODER)
MOZ_AUDIO_OFFLOAD=1
MOZ_SECUREELEMENT=1
AC_SUBST(MOZ_AUDIO_OFFLOAD)
@@ -166,28 +151,34 @@ if test -n "$gonkdir" ; then
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 -I$gonkdir/external/mdnsresponder/mDNSShared"
MOZ_AUDIO_OFFLOAD=1
MOZ_OMX_DECODER=1
MOZ_OMX_ENCODER=1
AC_DEFINE(MOZ_OMX_ENCODER)
AC_SUBST(MOZ_AUDIO_OFFLOAD)
AC_DEFINE(MOZ_AUDIO_OFFLOAD)
MOZ_B2G_CAMERA=1
- if test -d "$gonkdir/system/bluetoothd"; then
- MOZ_B2G_BT=1
- MOZ_B2G_BT_DAEMON=1
- fi
MOZ_NFC=1
MOZ_RTSP=1
;;
*)
AC_MSG_ERROR([Unsupported platform version: $ANDROID_VERSION])
;;
esac
+ dnl Enable Bluetooth backends depending on available drivers
+ if test -d "$gonkdir/system/bluetoothd"; then
+ MOZ_B2G_BT=1
+ MOZ_B2G_BT_DAEMON=1
+ fi
+ if test -d "$gonkdir/external/bluetooth/bluez"; then
+ MOZ_B2G_BT=1
+ MOZ_B2G_BT_BLUEZ=1
+ fi
+
CPPFLAGS="-I$gonkdir/system -I$gonkdir/system/core/include -I$gonkdir/hardware/libhardware/include -I$gonkdir/external/valgrind/fxos-include $GONK_INCLUDES $CPPFLAGS"
LDFLAGS="-L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib $LDFLAGS"
dnl Add -llog by default, since we use it all over the place.
LIBS="$LIBS -llog"
AC_DEFINE(ANDROID)
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $ANDROID_VERSION)
AC_SUBST(ANDROID_VERSION)