Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-05-09 07:01:19 +08:00
commit bd1e07b203
33 changed files with 163 additions and 449 deletions

View file

@ -87,8 +87,7 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
DIRS += ['filepicker']
if CONFIG['MOZ_TOOLKIT_SEARCH'] and not CONFIG['MC_BASILISK'] \
and not CONFIG['HYPE_ICEWEASEL'] \
and not CONFIG['HYPE_ICEDOVE']:
and not CONFIG['HYPE_ICEWEASEL']:
DIRS += ['search']
if CONFIG['MOZ_URL_CLASSIFIER']: