From 9e90060d9e72860be6278a1ac508ad9ae76a76f6 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Fri, 13 Nov 2015 15:23:41 +0100
Subject: [PATCH] Bug 1224166: Build BluetoothCommon.cpp unconditionally,
 r=shuang

---
 dom/bluetooth/moz.build | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
index fddf9d0b1e84..4977b95ff13c 100644
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -16,7 +16,6 @@ if CONFIG['MOZ_B2G_BT']:
         ]
 
     SOURCES += [
-        'common/BluetoothCommon.cpp',
         'common/BluetoothHidManager.cpp',
         'common/BluetoothInterface.cpp',
         'common/BluetoothProfileController.cpp',
@@ -130,8 +129,6 @@ if CONFIG['MOZ_B2G_BT']:
         DEFINES['MOZ_BLUETOOTH_DBUS'] = True
         DEFINES['HAVE_PTHREADS'] = True
 
-    FINAL_LIBRARY = 'xul'
-
 #
 # Exported interfaces
 #
@@ -160,6 +157,11 @@ EXPORTS.mozilla.dom.bluetooth += [
     'common/webapi/BluetoothPairingListener.h',
     'common/webapi/BluetoothPbapRequestHandle.h'
 ]
+
+UNIFIED_SOURCES += [
+    'common/BluetoothCommon.cpp',
+]
+
 IPDL_SOURCES += [
     'ipc/BluetoothTypes.ipdlh',
     'ipc/PBluetooth.ipdl',
@@ -173,3 +175,5 @@ LOCAL_INCLUDES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'