From cfc35322a6b21722f8460588604d00f7364b5a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Mon, 15 Oct 2012 11:14:53 -0700
Subject: [PATCH] Bug 794228 - addon-manager services are running in B2G
 [r=glandium]

---
 b2g/installer/package-manifest.in              | 4 +++-
 toolkit/components/telemetry/Makefile.in       | 5 ++++-
 toolkit/components/telemetry/TelemetryPing.js  | 6 +++++-
 toolkit/mozapps/extensions/Makefile.in         | 2 +-
 toolkit/mozapps/extensions/extensions.manifest | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index ea67a78518ed..426bd53b753a 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -2,7 +2,7 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; Package file for the B2G build. 
+; Package file for the B2G build.
 ;
 ; File format:
 ;
@@ -380,11 +380,13 @@
 @BINPATH@/components/GPSDGeolocationProvider.js
 @BINPATH@/components/nsSidebar.manifest
 @BINPATH@/components/nsSidebar.js
+#ifndef MOZ_WIDGET_GONK
 @BINPATH@/components/extensions.manifest
 @BINPATH@/components/addonManager.js
 @BINPATH@/components/amContentHandler.js
 @BINPATH@/components/amWebInstallListener.js
 @BINPATH@/components/nsBlocklistService.js
+#endif
 
 #ifdef MOZ_UPDATER
 @BINPATH@/components/nsUpdateService.manifest
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index 921eea49d730..b88b4d66f7dd 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -33,9 +33,12 @@ XPIDLSRCS = \
   nsITelemetry.idl \
   $(NULL)
 
+EXTRA_PP_COMPONENTS = \
+  TelemetryPing.js \
+  $(NULL)
+
 EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
-  TelemetryPing.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 8bbddfc92c74..9e9c6f85c088 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -11,8 +11,10 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
+#ifndef MOZ_WIDGET_GONK
 Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
-Cu.import("resource://gre/modules/ctypes.jsm"); 
+#endif
+Cu.import("resource://gre/modules/ctypes.jsm");
 
 // When modifying the payload in incompatible ways, please bump this version number
 const PAYLOAD_VERSION = 1;
@@ -379,9 +381,11 @@ TelemetryPing.prototype = {
       }
     }
 
+#ifndef MOZ_WIDGET_GONK
     let theme = LightweightThemeManager.currentTheme;
     if (theme)
       ret.persona = theme.id;
+#endif
 
     if (this._addons)
       ret.addons = this._addons;
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index 2c55e57becdf..002070025906 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -35,10 +35,10 @@ XPIDLSRCS = \
 
 EXTRA_PP_COMPONENTS = \
   nsBlocklistService.js \
+  extensions.manifest \
   $(NULL)
 
 EXTRA_COMPONENTS = \
-  extensions.manifest \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/extensions/extensions.manifest
index b73213df89f1..7ac5a2076c76 100644
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/mozapps/extensions/extensions.manifest
@@ -1,5 +1,6 @@
 component {66354bc9-7ed1-4692-ae1d-8da97d6b205e} nsBlocklistService.js
 contract @mozilla.org/extensions/blocklist;1 {66354bc9-7ed1-4692-ae1d-8da97d6b205e}
+#ifndef MOZ_WIDGET_GONK
 category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
 component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
 contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
@@ -9,3 +10,4 @@ contract @mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall {
 component {0f38e086-89a3-40a5-8ffc-9b694de1d04a} amWebInstallListener.js
 contract @mozilla.org/addons/web-install-listener;1 {0f38e086-89a3-40a5-8ffc-9b694de1d04a}
 category addon-provider-module PluginProvider resource://gre/modules/PluginProvider.jsm
+#endif