diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:58 +0200 |
| commit | 6571d2ceb42930dab01677ef0e95e732d5076fb8 (patch) | |
| tree | 8c593b8e09f2cfb457df72d40dc719bb0e0df066 /tools/profiler/core/GeckoSampler.cpp | |
| parent | 2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff) | |
| download | UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.gz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.lz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.xz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.zip | |
Remove MOZ_WIDGET_GONK [1/2]
Tag #288
Diffstat (limited to 'tools/profiler/core/GeckoSampler.cpp')
| -rw-r--r-- | tools/profiler/core/GeckoSampler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/profiler/core/GeckoSampler.cpp b/tools/profiler/core/GeckoSampler.cpp index f4249a7a5..4283542f6 100644 --- a/tools/profiler/core/GeckoSampler.cpp +++ b/tools/profiler/core/GeckoSampler.cpp @@ -44,7 +44,7 @@ #include "mozilla/ProfileGatherer.h" #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) #include "FennecJNIWrappers.h" #endif @@ -213,7 +213,7 @@ GeckoSampler::GeckoSampler(double aInterval, int aEntrySize, } #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) mProfileJava = mozilla::jni::IsFennec() && hasFeature(aFeatures, aFeatureCount, "java"); #else @@ -462,7 +462,7 @@ void SubProcessCallback(const char* aProfile, void* aClosure) } -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) static void BuildJavaThreadJSObject(SpliceableJSONWriter& aWriter) { @@ -567,7 +567,7 @@ void GeckoSampler::StreamJSON(SpliceableJSONWriter& aWriter, double aSinceTime) } } - #if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) + #if defined(SPS_OS_android) if (ProfileJava()) { java::GeckoJavaSampler::Pause(); |