Bug 1365309 - Part 2: re-enable BHR on linux, r=froydnj

MozReview-Commit-ID: BtRZecG4IYA

toolkit/components/telemetry/tests/unit/xpcshell.ini

@@ -53,7 +53,7 @@ tags = addons
 tags = addons
 [test_TelemetrySession_activeTicks.js]
 [test_ThreadHangStats.js]
-skip-if = os == "android" || os == "linux" # BHR is disabled on linux (bug 1365309)
+skip-if = os == "android" # BHR is disabled on android (bug 1368520)
 run-sequentially = Bug 1046307, test can fail intermittently when CPU load is high
 [test_TelemetrySend.js]
 [test_ChildHistograms.js]

xpcom/threads/ThreadStackHelper.h

@@ -30,12 +30,12 @@
 #  endif
 #endif
 
-// NOTE: Currently, due to a problem with LUL stackwalking initialization taking
-// a long time (bug 1365309), we don't perform pseudostack or native stack
-// walking on Linux.
-#if defined(XP_LINUX)
-#  undef MOZ_THREADSTACKHELPER_NATIVE
+
+// Android x86 builds consistently crash in the Background Hang Reporter. bug
+// 1368520.
+#if defined(__ANDROID__)
 #  undef MOZ_THREADSTACKHELPER_PSEUDO
+#  undef MOZ_THREADSTACKHELPER_NATIVE
 #endif
 
 namespace mozilla {