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
This commit is contained in:
NTD 2018-04-05 06:02:02 -04:00 • committed by Roy Tam
commit e035963fa2
6 changed files with 45 additions and 36 deletions

View file

@ -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',