Bug 1038961 - Fix --disable_webrtc breakage due to mtransport/runnable_utils. r=dholbert, r=ted, a=sledru
authorRandell Jesup <rjesup@jesup.org>
Wed, 23 Jul 2014 04:26:05 -0400
changeset 217244 cd2fe0d4f4a9ad3d729ee829fdf95b15545a4fff
parent 217243 40218ed779cb74ea00b8bf5909eda72c762e603d
child 217245 4d2100935ac95cf03601b0b27c3a9df84e20f15e
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert, ted, sledru
bugs1038961
milestone33.0a2
Bug 1038961 - Fix --disable_webrtc breakage due to mtransport/runnable_utils. r=dholbert, r=ted, a=sledru
content/media/gmp/GMPParent.cpp
content/media/gmp/moz.build
--- a/content/media/gmp/GMPParent.cpp
+++ b/content/media/gmp/GMPParent.cpp
@@ -10,17 +10,17 @@
 #include "nsILineInputStream.h"
 #include "nsNetUtil.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsThreadUtils.h"
 #include "nsIRunnable.h"
 #include "mozIGeckoMediaPluginService.h"
 #include "mozilla/unused.h"
 #include "nsIObserverService.h"
-#include "mtransport/runnable_utils.h"
+#include "runnable_utils.h"
 
 #include "mozilla/dom/CrashReporterParent.h"
 using mozilla::dom::CrashReporterParent;
 
 #ifdef MOZ_CRASHREPORTER
 using CrashReporter::AnnotationTable;
 using CrashReporter::GetIDFromMinidump;
 #endif
@@ -316,27 +316,27 @@ GMPParent::GetCrashID(nsString& aResult)
   TakeMinidump(getter_AddRefs(dumpFile), nullptr);
   if (!dumpFile) {
     NS_WARNING("GMP crash without crash report");
     return;
   }
   GetIDFromMinidump(dumpFile, aResult);
   cr->GenerateCrashReportForMinidump(dumpFile, &notes);
 }
-#endif
 
 static void
 GMPNotifyObservers(nsAString& aData)
 {
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
     nsString temp(aData);
     obs->NotifyObservers(nullptr, "gmp-plugin-crash", temp.get());
   }
 }
+#endif
 
 void
 GMPParent::ActorDestroy(ActorDestroyReason aWhy)
 {
 #ifdef MOZ_CRASHREPORTER
   if (AbnormalShutdown == aWhy) {
     nsString dumpID;
     GetCrashID(dumpID);
--- a/content/media/gmp/moz.build
+++ b/content/media/gmp/moz.build
@@ -82,14 +82,16 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # comment this out to use Unsafe Shmem for more performance
 DEFINES['GMP_SAFE_SHMEM'] = True
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+# media/mtransport so we work with --disable-webrtc
 LOCAL_INCLUDES += [
     '../base',
+    '/media/mtransport',
     '/xpcom/base',
     '/xpcom/build',
     '/xpcom/threads',
 ]