Bug 1207266 - turn off b2g stumbler if no RIL. r=jdm

dom/system/gonk/GonkGPSGeolocationProvider.cpp

@@ -15,7 +15,6 @@
  */
 
 #include "GonkGPSGeolocationProvider.h"
-#include "mozstumbler/MozStumbler.h"
 
 #include <pthread.h>
 #include <hardware/gps.h>
@@ -40,6 +39,7 @@
 #include "mozilla/dom/SettingChangeNotificationBinding.h"
 
 #ifdef MOZ_B2G_RIL
+#include "mozstumbler/MozStumbler.h"
 #include "nsIIccInfo.h"
 #include "nsIMobileConnectionInfo.h"
 #include "nsIMobileConnectionService.h"
@@ -148,7 +148,9 @@ GonkGPSGeolocationProvider::LocationCallback(GpsLocation* location)
   nsRefPtr<UpdateLocationEvent> event = new UpdateLocationEvent(somewhere);
   NS_DispatchToMainThread(event);
 
+#ifdef MOZ_B2G_RIL
   MozStumble(somewhere);
+#endif
 }
 
 void

dom/system/gonk/moz.build

@@ -35,7 +35,6 @@ XPIDL_MODULE = 'dom_system_gonk'
 EXPORTS += [
     'GeolocationUtil.h',
     'GonkGPSGeolocationProvider.h',
-    'mozstumbler/MozStumbler.h',
     'nsVolume.h',
     'nsVolumeService.h',
 ]
@@ -49,10 +48,6 @@ UNIFIED_SOURCES += [
     'MozMtpDatabase.cpp',
     'MozMtpServer.cpp',
     'MozMtpStorage.cpp',
-    'mozstumbler/MozStumbler.cpp',
-    'mozstumbler/StumblerLogging.cpp',
-    'mozstumbler/UploadStumbleRunnable.cpp',
-    'mozstumbler/WriteStumbleOnThread.cpp',
     'NetIdManager.cpp',
     'NetworkUtils.cpp',
     'NetworkWorker.cpp',
@@ -93,6 +88,15 @@ EXTRA_JS_MODULES += [
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
+    EXPORTS += [
+         'mozstumbler/MozStumbler.h',
+    ]
+    UNIFIED_SOURCES += [
+          'mozstumbler/MozStumbler.cpp',
+          'mozstumbler/StumblerLogging.cpp',
+          'mozstumbler/UploadStumbleRunnable.cpp',
+          'mozstumbler/WriteStumbleOnThread.cpp'
+    ]
     XPIDL_SOURCES += [
         'nsIDataCallInterfaceService.idl',
         'nsIDataCallManager.idl',