Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1257326 - Move MOZ_SERVICES_SYNC to Python configure. r=glandium

Browse Source 
MozReview-Commit-ID: DCDoSgHfwVY
This commit is contained in:
Chris Manchester 2016-05-12 11:55:59 -07:00
parent a7cfc175b0
commit 6cb2abce23
7 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,9 +292,6 @@
@RESPATH@/components/satchel.xpt
@RESPATH@/components/saxparser.xpt
@RESPATH@/components/sessionstore.xpt
#ifdef MOZ_SERVICES_SYNC
@RESPATH@/components/services-crypto.xpt
#endif
@RESPATH@/components/services-crypto-component.xpt
@RESPATH@/components/captivedetect.xpt
@RESPATH@/components/shellservice.xpt
@ -597,12 +594,6 @@
@RESPATH@/components/nsINIProcessor.js
@RESPATH@/components/nsPrompter.manifest
@RESPATH@/components/nsPrompter.js
#ifdef MOZ_SERVICES_SYNC
@RESPATH@/components/SyncComponents.manifest
@RESPATH@/components/Weave.js
@RESPATH@/components/WeaveCrypto.manifest
@RESPATH@/components/WeaveCrypto.js
#endif
@RESPATH@/components/servicesComponents.manifest
@RESPATH@/components/cryptoComponents.manifest
@RESPATH@/components/CaptivePortalDetectComponents.manifest
@ -737,11 +728,6 @@
@RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js
; Services (gre) prefs
#ifdef MOZ_SERVICES_SYNC
@RESPATH@/defaults/pref/services-sync.js
#endif
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@RESPATH@/res/EditorOverride.css

1
browser/confvars.sh
View File

@ -28,7 +28,6 @@ fi
MOZ_ENABLE_SIGNMAR=1
MOZ_SAFE_BROWSING=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_CLOUDSYNC=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY

1
browser/moz.configure
View File

@ -6,5 +6,6 @@
imply_option('MOZ_PLACES', True)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_SERVICES_SYNC', True)
include('../toolkit/moz.configure')

1
embedding/ios/confvars.sh
View File

@ -8,4 +8,3 @@ MOZ_APP_DISPLAYNAME=GeckoEmbed
MOZ_UPDATER=
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_EXTENSIONS_DEFAULT=" gio"
MOZ_SERVICES_SYNC=1

1
embedding/ios/moz.configure
View File

@ -6,3 +6,4 @@
imply_option('MOZ_PLACES', True)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_SERVICES_SYNC', True)

6
old-configure.in
View File

@ -6553,12 +6553,6 @@ if test "$BUILD_CTYPES"; then
AC_DEFINE(BUILD_CTYPES)
fi
dnl Build Sync Services if required
AC_SUBST(MOZ_SERVICES_SYNC)
if test -n "$MOZ_SERVICES_SYNC"; then
AC_DEFINE(MOZ_SERVICES_SYNC)
fi
dnl Build Services/CloudSync if required
AC_SUBST(MOZ_SERVICES_CLOUDSYNC)
if test -n "$MOZ_SERVICES_CLOUDSYNC"; then

3
toolkit/moz.configure
View File

@ -409,6 +409,9 @@ project_flag('MOZ_SERVICES_HEALTHREPORT',
set_for_old_configure=True,
set_as_define=True)
project_flag('MOZ_SERVICES_SYNC',
help='Build Sync Services if required')
# Miscellaneous programs
# ==============================================================