зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1305271 - Only enable Java profiling on Android; r=bustage on CLOSED TREE
Only enable Java profiling (and access jni::IsFennec) on Android, where Java profiling makes sense.
This commit is contained in:
Родитель
dc65b25659
Коммит
52cdccecbf
|
@ -192,8 +192,6 @@ GeckoSampler::GeckoSampler(double aInterval, int aEntrySize,
|
|||
mUseStackWalk = hasFeature(aFeatures, aFeatureCount, "stackwalk");
|
||||
|
||||
mProfileJS = hasFeature(aFeatures, aFeatureCount, "js");
|
||||
mProfileJava = mozilla::jni::IsFennec() &&
|
||||
hasFeature(aFeatures, aFeatureCount, "java");
|
||||
mProfileGPU = hasFeature(aFeatures, aFeatureCount, "gpu");
|
||||
mProfilePower = hasFeature(aFeatures, aFeatureCount, "power");
|
||||
// Users sometimes ask to filter by a list of threads but forget to request
|
||||
|
@ -215,6 +213,13 @@ GeckoSampler::GeckoSampler(double aInterval, int aEntrySize,
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
|
||||
mProfileJava = mozilla::jni::IsFennec() &&
|
||||
hasFeature(aFeatures, aFeatureCount, "java");
|
||||
#else
|
||||
mProfileJava = false;
|
||||
#endif
|
||||
|
||||
// Deep copy aThreadNameFilters
|
||||
MOZ_ALWAYS_TRUE(mThreadNameFilters.resize(aFilterCount));
|
||||
for (uint32_t i = 0; i < aFilterCount; ++i) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче