Bug 753085: Desktop m-c does not compile with enable-b2g-ril on and enable-b2g-bt off; r=mwu
--- a/dom/system/gonk/SystemWorkerManager.cpp
+++ b/dom/system/gonk/SystemWorkerManager.cpp
@@ -66,18 +66,20 @@
#else
#define BTDEBUG true
#define LOG(args...) if(BTDEBUG) printf(args);
#endif
USING_WORKERS_NAMESPACE
using namespace mozilla::dom::gonk;
+using namespace mozilla::ipc;
+#ifdef MOZ_B2G_BT
using namespace mozilla::dom::bluetooth;
-using namespace mozilla::ipc;
+#endif
namespace {
NS_DEFINE_CID(kRadioInterfaceLayerCID, NS_RADIOINTERFACELAYER_CID);
NS_DEFINE_CID(kWifiWorkerCID, NS_WIFIWORKER_CID);
// Doesn't carry a reference, we're owned by services.
SystemWorkerManager *gInstance = nsnull;
@@ -390,19 +392,17 @@ SystemWorkerManager::InitBluetooth(JSCon
#ifdef MOZ_B2G_BT
#ifdef MOZ_WIDGET_GONK
// We need a platform specific check here to make sure of when we're
// running on an emulator. Therefore, if we're compiled with gonk,
// see if we can load functions out of bluedroid. If not, assume
// it's an emulator and don't start the bluetooth thread.
if(EnsureBluetoothInit()) {
#endif
-#endif
StartDBus();
-#ifdef MOZ_B2G_BT
#ifdef MOZ_WIDGET_GONK
}
else {
LOG("Bluedroid functions not available, assuming running on simulator. Not starting DBus thread.");
}
#endif
#endif
return NS_OK;