From 5f4621e3f427e095ff90ec3b440c068d9ae48610 Mon Sep 17 00:00:00 2001
From: Sotaro Ikeda <sikeda@mozilla.com>
Date: Tue, 11 Jun 2013 16:47:44 -0400
Subject: [PATCH] Bug 881565 - nsAppShell fails to compile with JB Gonk, r=mwu

---
 widget/gonk/nsAppShell.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/widget/gonk/nsAppShell.cpp b/widget/gonk/nsAppShell.cpp
index 454c7debf0e..51b8afd7222 100644
--- a/widget/gonk/nsAppShell.cpp
+++ b/widget/gonk/nsAppShell.cpp
@@ -30,7 +30,9 @@
 
 #include "base/basictypes.h"
 #include "nscore.h"
+#ifdef MOZ_OMX_DECODER
 #include "MediaResourceManagerService.h"
+#endif
 #include "mozilla/FileUtils.h"
 #include "mozilla/Hal.h"
 #include "mozilla/Mutex.h"
@@ -640,10 +642,11 @@ nsAppShell::Init()
 
     InitGonkMemoryPressureMonitoring();
 
+#ifdef MOZ_OMX_DECODER
     if (XRE_GetProcessType() == GeckoProcessType_Default) {
       android::MediaResourceManagerService::instantiate();
     }
-
+#endif
     nsCOMPtr<nsIObserverService> obsServ = GetObserverService();
     if (obsServ) {
         obsServ->AddObserver(this, "browser-ui-startup-complete", false);