Skip to content

Commit

Permalink
Bug 1257326 - Move MOZ_SERVICES_SYNC to Python configure. r=glandium
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: DCDoSgHfwVY
  • Loading branch information
chmanchester committed May 12, 2016
1 parent 9adaba5 commit cf25069
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 22 deletions.
14 changes: 0 additions & 14 deletions b2g/installer/package-manifest.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion browser/confvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions browser/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 0 additions & 1 deletion embedding/ios/confvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ MOZ_APP_DISPLAYNAME=GeckoEmbed
MOZ_UPDATER=
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_EXTENSIONS_DEFAULT=" gio"
MOZ_SERVICES_SYNC=1
1 change: 1 addition & 0 deletions embedding/ios/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@

imply_option('MOZ_PLACES', True)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_SERVICES_SYNC', True)
6 changes: 0 additions & 6 deletions old-configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions toolkit/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ==============================================================

Expand Down

0 comments on commit cf25069

Please sign in to comment.