Bug 974100 - Don't expose SettingsService in non b2g builds. r=bent

This commit is contained in:
Gregor Wagner 2014-02-19 10:26:49 -08:00
parent 2a4b6ffa50
commit f37b226c93
4 changed files with 8 additions and 7 deletions

View File

@ -501,8 +501,6 @@
@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

View File

@ -9,10 +9,14 @@ 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',

View File

@ -6,5 +6,6 @@
MOCHITEST_MANIFESTS += ['mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
if CONFIG['MOZ_B2G']:
MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']

View File

@ -288,8 +288,6 @@
@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