diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-05 06:02:02 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-05 06:02:02 -0400 |
| commit | 5593323410b2373ef7c4abcc4826d85e573a13fc (patch) | |
| tree | a3d53a8160cdd50cf8eef491310af5c73ae3fe3b /toolkit | |
| parent | 86f601589431c500a1a299000a3eac34d5b0247d (diff) | |
| download | uxp-5593323410b2373ef7c4abcc4826d85e573a13fc.tar.gz | |
Take the following project_flags out of moz.configure: and put them back into old-configure
MOZ_PLACES
MOZ_SOCIAL
MOZ_SERVICES_HEALTHREPORT
MOZ_SERVICES_SYNC
MOZ_SERVICES_CLOUDSYNC
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/moz.configure | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 4717af022d..c1e0880c93 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -444,34 +444,10 @@ def omnijar_name(toolkit): set_config('OMNIJAR_NAME', omnijar_name) -project_flag('MOZ_PLACES', - help='Build Places if required', - set_as_define=True) - -project_flag('MOZ_SOCIAL', - help='Build SocialAPI if required', - default=True) - -project_flag('MOZ_SERVICES_HEALTHREPORT', - help='Build Firefox Health Reporter Service', - set_for_old_configure=True, - set_as_define=True) - -project_flag('MOZ_SERVICES_SYNC', - help='Build Sync Services if required') - -project_flag('MOZ_SERVICES_CLOUDSYNC', - help='Build Services/CloudSync if required') - project_flag('MOZ_ANDROID_HISTORY', help='Enable Android History instead of Places', set_as_define=True) -@depends('MOZ_PLACES', 'MOZ_ANDROID_HISTORY') -def check_places_and_android_history(places, android_history): - if places and android_history: - die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.') - # Permissions system # ============================================================== option(name='--disable-permissions', |