Bug 957514 - Fix FakeSurfaceComposer compile error in gonk-kk. r=mwu
authorKai-Zhen Li <kli@mozilla.com>
Wed, 08 Jan 2014 19:04:32 +0800
changeset 162538 acdb2a60fdaa75d058f63e0ccc2abb695e71eaa8
parent 162537 7d434e24be3b990be881554e992710e1ceead673
child 162539 b08d38d5c0f6a473bfcca35e74cacd16caf5a8ea
push id25958
push userryanvm@gmail.com
push dateWed, 08 Jan 2014 20:22:21 +0000
treeherdermozilla-central@8988416e489d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs957514
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 957514 - Fix FakeSurfaceComposer compile error in gonk-kk. r=mwu
widget/gonk/nsAppShell.cpp
--- a/widget/gonk/nsAppShell.cpp
+++ b/widget/gonk/nsAppShell.cpp
@@ -868,17 +868,17 @@ nsAppShell::Init()
     NS_ENSURE_SUCCESS(rv, rv);
 
     InitGonkMemoryPressureMonitoring();
 
     if (XRE_GetProcessType() == GeckoProcessType_Default) {
 #ifdef MOZ_OMX_DECODER
         android::MediaResourceManagerService::instantiate();
 #endif
-#if ANDROID_VERSION >= 18
+#if ANDROID_VERSION >= 18 && (defined(MOZ_OMX_DECODER) || defined(MOZ_B2G_CAMERA))
         android::FakeSurfaceComposer::instantiate();
 #endif
         GonkPermissionService::instantiate();
     }
 
     nsCOMPtr<nsIObserverService> obsServ = GetObserverService();
     if (obsServ) {
         obsServ->AddObserver(this, "browser-ui-startup-complete", false);