From bca74a81e743450cb43da78c66a9adc53e5b1c78 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 3 Nov 2014 13:03:48 +0100 Subject: [PATCH] Bug 1073548: Support Bluetooth daemon in build system, r=mh+mozilla --- configure.in | 6 ++++++ dom/bluetooth/moz.build | 2 ++ 2 files changed, 8 insertions(+) diff --git a/configure.in b/configure.in index dfb08cac7929..cd589846b8f4 100644 --- a/configure.in +++ b/configure.in @@ -258,6 +258,9 @@ if test -n "$gonkdir" ; then elif test -d "$gonkdir/external/bluetooth/bluedroid"; then MOZ_B2G_BT=1 MOZ_B2G_BT_BLUEDROID=1 + if test -d "$gonkdir/system/bluetoothd"; then + MOZ_B2G_BT_DAEMON=1 + fi fi MOZ_RTSP=1 @@ -275,6 +278,9 @@ if test -n "$gonkdir" ; then MOZ_B2G_CAMERA=1 MOZ_B2G_BT=1 MOZ_B2G_BT_BLUEDROID=1 + if test -d "$gonkdir/system/bluetoothd"; then + MOZ_B2G_BT_DAEMON=1 + fi MOZ_NFC=1 MOZ_RTSP=1 MOZ_OMX_DECODER=1 diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index a05e78dd1c33..a9a30c8f9858 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -78,6 +78,8 @@ if CONFIG['MOZ_B2G_BT']: ] DEFINES['MOZ_B2G_BT_BLUEDROID'] = True + if CONFIG['MOZ_B2G_BT_DAEMON']: + DEFINES['MOZ_B2G_BT_DAEMON'] = True elif CONFIG['MOZ_ENABLE_DBUS']: CFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']