wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1032017 Remove MOZ_SERVICES_FXACCOUNTS flags as it is no longer necessary. Also fixes test_hawkrequest.js failures in m-c. r=glandium

Browse Source
This commit is contained in:
Mark Banner 2014-07-08 07:37:57 +01:00
parent 9a5e2a9b04
commit 70684d8faf
12 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/b2g.js
View File

@ -991,10 +991,8 @@ pref("touchcaret.enabled", false);
pref("selectioncaret.enabled", false);
// Enable sync and mozId with Firefox Accounts.
#ifdef MOZ_SERVICES_FXACCOUNTS
pref("services.sync.fxaccounts.enabled", true);
pref("identity.fxaccounts.enabled", true);
#endif
// Mobile Identity API.
pref("services.mobileid.server.uri", "https://msisdn-dev.stage.mozaws.net");

2
b2g/app/moz.build
View File

@ -19,7 +19,7 @@ if not CONFIG['LIBXUL_SDK']:
DEFINES['XPCOM_GLUE'] = True
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER', 'MOZ_SERVICES_FXACCOUNTS'):
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
DEFINES[var] = CONFIG[var]
GENERATED_INCLUDES += [

3
b2g/chrome/content/shell.js
View File

@ -26,10 +26,7 @@ Cu.import('resource://gre/modules/ResourceStatsService.jsm');
Cu.import('resource://gre/modules/SignInToWebsite.jsm');
SignInToWebsiteController.init();
#ifdef MOZ_SERVICES_FXACCOUNTS
Cu.import('resource://gre/modules/FxAccountsMgmtService.jsm');
#endif
Cu.import('resource://gre/modules/DownloadsAPI.jsm');
Cu.import('resource://gre/modules/MobileIdentityManager.jsm');

2
b2g/components/B2GComponents.manifest
View File

@ -80,11 +80,9 @@ component {637b0f77-2429-49a0-915f-abf5d0db8b9a} WebappsUpdateTimer.js
contract @mozilla.org/b2g/webapps-update-timer;1 {637b0f77-2429-49a0-915f-abf5d0db8b9a}
category update-timer WebappsUpdateTimer @mozilla.org/b2g/webapps-update-timer;1,getService,background-update-timer,webapps.update.interval,86400
#ifdef MOZ_SERVICES_FXACCOUNTS
# FxAccountsUIGlue.js
component {51875c14-91d7-4b8c-b65d-3549e101228c} FxAccountsUIGlue.js
contract @mozilla.org/fxaccounts/fxaccounts-ui-glue;1 {51875c14-91d7-4b8c-b65d-3549e101228c}
#endif
# HelperAppDialog.js
component {710322af-e6ae-4b0c-b2c9-1474a87b077e} HelperAppDialog.js

10
b2g/components/moz.build
View File

@ -12,6 +12,7 @@ EXTRA_COMPONENTS += [
'B2GAboutRedirector.js',
'ContentPermissionPrompt.js',
'FilePicker.js',
'FxAccountsUIGlue.js'
'HelperAppDialog.js',
'InterAppCommUIGlue.js',
'MailtoProtocolHandler.js',
@ -48,6 +49,7 @@ EXTRA_JS_MODULES += [
'AppFrames.jsm',
'ContentRequestHelper.jsm',
'ErrorPage.jsm',
'FxAccountsMgmtService.jsm'
'SignInToWebsite.jsm',
'SystemAppProxy.jsm',
'TelURIParser.jsm',
@ -58,11 +60,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
EXTRA_JS_MODULES += [
'GlobalSimulatorScreen.jsm'
]
if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
EXTRA_COMPONENTS += [
'FxAccountsUIGlue.js'
]
EXTRA_JS_MODULES += [
'FxAccountsMgmtService.jsm'
]

2
b2g/confvars.sh
View File

@ -64,8 +64,6 @@ MOZ_FOLD_LIBS=1
MOZ_JSDOWNLOADS=1
MOZ_SERVICES_FXACCOUNTS=1
MOZ_BUNDLED_FONTS=1
# Enable exact rooting on b2g.

2
b2g/installer/package-manifest.in
View File

@ -832,10 +832,8 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@BINPATH@/components/SimulatorScreen.js
#endif
#ifdef MOZ_SERVICES_FXACCOUNTS
@BINPATH@/components/FxAccountsUIGlue.js
@BINPATH@/components/services_fxaccounts.xpt
#endif
@BINPATH@/components/DataStore.manifest
@BINPATH@/components/DataStoreImpl.js

1
browser/confvars.sh
View File

@ -28,7 +28,6 @@ MOZ_DISABLE_EXPORT_JS=1
MOZ_SAFE_BROWSING=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_FXACCOUNTS=1
MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_METRICS=1
MOZ_SERVICES_SYNC=1

8
configure.in
View File

@ -7551,14 +7551,6 @@ if test -n "$MOZ_AUDIO_CHANNEL_MANAGER"; then
fi
AC_SUBST(MOZ_AUDIO_CHANNEL_MANAGER)
dnl ========================================================
dnl = Enable Support for Firefox Accounts (services/fxaccounts)
dnl ========================================================
if test -n "$MOZ_SERVICES_FXACCOUNTS"; then
AC_DEFINE(MOZ_SERVICES_FXACCOUNTS)
fi
AC_SUBST(MOZ_SERVICES_FXACCOUNTS)
dnl ========================================================
dnl = Support for demangling undefined symbols
dnl ========================================================

3
mobile/android/confvars.sh
View File

@ -58,9 +58,6 @@ MOZ_PAY=1
# Enable UI for healthreporter
MOZ_SERVICES_HEALTHREPORT=1
# Enable FirefoxAccounts
MOZ_SERVICES_FXACCOUNTS=1
# Wifi-AP/cell tower data reporting is enabled on non-release builds.
if test ! "$RELEASE_BUILD"; then
MOZ_DATA_REPORTING=1

1
python/mozbuild/mozbuild/mozinfo.py
View File

@ -78,7 +78,6 @@ def build_dict(config, env=os.environ):
d['debug'] = substs.get('MOZ_DEBUG') == '1'
d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))
d['fxaccounts'] = substs.get('MOZ_SERVICES_FXACCOUNTS') == '1'
d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
d['asan'] = substs.get('MOZ_ASAN') == '1'
d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"

6
services/moz.build
View File

@ -6,7 +6,8 @@
PARALLEL_DIRS += [
'common',
'crypto'
'crypto',
'fxaccounts',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
@ -21,9 +22,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
if CONFIG['MOZ_SERVICES_METRICS']:
PARALLEL_DIRS += ['metrics']
if CONFIG['MOZ_SERVICES_FXACCOUNTS']:
PARALLEL_DIRS += ['fxaccounts']
if CONFIG['MOZ_SERVICES_SYNC']:
PARALLEL_DIRS += ['sync']