--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -29,17 +29,17 @@
 #include "nsIXULRuntime.h"
 #include "nsIXULAppInfo.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIObserverService.h"
 #include "mozilla/Services.h"
 #include "PlatformMacros.h"
 
-#ifdef ANDROID
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
   #include "AndroidBridge.h"
 #endif
 
 // JS
 #include "jsdbgapi.h"
 
 // we eventually want to make this runtime switchable
 #if defined(MOZ_PROFILING) && (defined(XP_UNIX) && !defined(XP_MACOSX))
@@ -159,17 +159,17 @@ JSObject* TableTicker::ToJSObject(JSCont
   JSObjectBuilder b(aCx);
   JSCustomObject* profile = b.CreateObject();
   BuildJSObject(b, profile);
   JSObject* jsProfile = b.GetJSObject(profile);
 
   return jsProfile;
 }
 
-#ifdef ANDROID
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
 static
 JSCustomObject* BuildJavaThreadJSObject(JSAObjectBuilder& b)
 {
   JSCustomObject* javaThread = b.CreateObject();
   b.DefineProperty(javaThread, "name", "Java Main Thread");
 
   JSCustomArray *samples = b.CreateArray();
   b.DefineProperty(javaThread, "samples", samples);
@@ -238,17 +238,17 @@ void TableTicker::BuildJSObject(JSAObjec
       MutexAutoLock lock(*sRegisteredThreads->at(i)->Profile()->GetMutex());
 
       JSCustomObject* threadSamples = b.CreateObject();
       sRegisteredThreads->at(i)->Profile()->BuildJSObject(b, threadSamples);
       b.ArrayPush(threads, threadSamples);
     }
   }
 
-#ifdef ANDROID
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
   if (ProfileJava()) {
     AndroidBridge::Bridge()->PauseJavaProfiling();
 
     JSCustomObject* javaThread = BuildJavaThreadJSObject(b);
     b.ArrayPush(threads, javaThread);
 
     AndroidBridge::Bridge()->UnpauseJavaProfiling();
   }

--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -15,17 +15,17 @@
 #include "TableTicker.h"
 #include "UnwinderThread2.h"
 #include "nsIObserverService.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/Services.h"
 #include "nsThreadUtils.h"
 
-#ifdef ANDROID
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
   #include "AndroidBridge.h"
 #endif
 
 mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 mozilla::ThreadLocal<TableTicker *> tlsTicker;
 // We need to track whether we've been initialized otherwise
 // we end up using tlsStack without initializing it.
 // Because tlsStack is totally opaque to us we can't reuse
@@ -446,17 +446,17 @@ void mozilla_sampler_start(int aProfileE
         ThreadProfile* thread_profile = info->Profile();
         if (!thread_profile) {
           continue;
         }
         thread_profile->GetPseudoStack()->enableJSSampling();
       }
   }
 
-#ifdef ANDROID
+#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
   if (t->ProfileJava()) {
     int javaInterval = aInterval;
     // Java sampling doesn't accuratly keep up with 1ms sampling
     if (javaInterval < 10) {
       aInterval = 10;
     }
     mozilla::AndroidBridge::Bridge()->StartJavaProfiling(javaInterval, 1000);
   }