Bug 974100 - Don't expose SettingsService in non b2g builds. r=bent, a=dougt
authorGregor Wagner <anygregor@gmail.com>
Wed, 19 Feb 2014 10:26:49 -0800
changeset 176363 f1a476133811daed203cb5a115a0bce00b09e47b
parent 176362 9407bc2c1f20a7a59ddaae150716017a64423eda
child 176364 8025e17b77d5b6e39ff5778f8b187bfc239646a9
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent, dougt
bugs974100
milestone28.0
Bug 974100 - Don't expose SettingsService in non b2g builds. r=bent, a=dougt
browser/installer/package-manifest.in
dom/settings/moz.build
dom/settings/tests/moz.build
mobile/android/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -503,18 +503,16 @@
 @BINPATH@/components/servicesComponents.manifest
 @BINPATH@/components/cryptoComponents.manifest
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/SettingsManager.js
 @BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/SettingsService.js
-@BINPATH@/components/SettingsService.manifest
 @BINPATH@/components/Webapps.js
 @BINPATH@/components/Webapps.manifest
 @BINPATH@/components/AppsService.js
 @BINPATH@/components/AppsService.manifest
 @BINPATH@/components/nsDOMIdentity.js
 @BINPATH@/components/nsIDService.js
 @BINPATH@/components/Identity.manifest
 @BINPATH@/components/recording-cmdline.js
--- a/dom/settings/moz.build
+++ b/dom/settings/moz.build
@@ -4,17 +4,21 @@
 # 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/.
 
 TEST_DIRS += ['tests']
 
 EXTRA_COMPONENTS += [
     'SettingsManager.js',
     'SettingsManager.manifest',
-    'SettingsService.js',
-    'SettingsService.manifest',
 ]
 
+if CONFIG['MOZ_B2G']:
+    EXTRA_COMPONENTS += [
+        'SettingsService.js',
+        'SettingsService.manifest',
+    ]
+
 EXTRA_JS_MODULES += [
     'SettingsChangeNotifier.jsm',
     'SettingsDB.jsm',
     'SettingsQueue.jsm',
 ]
--- a/dom/settings/tests/moz.build
+++ b/dom/settings/tests/moz.build
@@ -1,10 +1,11 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
+if CONFIG['MOZ_B2G']:
+  MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -282,18 +282,16 @@
 @BINPATH@/components/ContactManager.js
 @BINPATH@/components/ContactManager.manifest
 @BINPATH@/components/PhoneNumberService.js
 @BINPATH@/components/PhoneNumberService.manifest
 @BINPATH@/components/NotificationStorage.js
 @BINPATH@/components/NotificationStorage.manifest
 @BINPATH@/components/SettingsManager.js
 @BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/SettingsService.js
-@BINPATH@/components/SettingsService.manifest
 @BINPATH@/components/BrowserElementParent.manifest
 @BINPATH@/components/BrowserElementParent.js
 @BINPATH@/components/FeedProcessor.manifest
 @BINPATH@/components/FeedProcessor.js
 @BINPATH@/components/BrowserFeeds.manifest
 @BINPATH@/components/FeedConverter.js
 @BINPATH@/components/FeedWriter.js
 @BINPATH@/components/PermissionSettings.js