diff options
Diffstat (limited to 'toolkit/moz.build')
| -rw-r--r-- | toolkit/moz.build | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/toolkit/moz.build b/toolkit/moz.build index 778f1c0de..397444828 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -22,15 +22,12 @@ DIRS += [ if CONFIG['MOZ_JETPACK']: DIRS += ['jetpack'] -if CONFIG['MOZ_WEBEXTENSIONS']: - DIRS += ['mozapps/webextensions'] -else: - DIRS += ['mozapps/extensions'] +DIRS += ['mozapps/extensions'] if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': DIRS += ['mozapps/update'] -if CONFIG['MOZ_MAINTENANCE_SERVICE'] or CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': +if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': # Including mozapps/update/common-standalone allows the maintenance service # to be built so the maintenance service can be used for things other than # updating applications. @@ -38,11 +35,6 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE'] or CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WI 'mozapps/update/common-standalone', ] -if CONFIG['MOZ_MAINTENANCE_SERVICE']: - DIRS += [ - 'components/maintenanceservice' - ] - DIRS += ['xre'] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): @@ -54,10 +46,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': DIRS += ['system/androidproxy'] -TEST_HARNESS_FILES.testing.mochitest.browser.toolkit.crashreporter.test.browser += [ - 'crashreporter/test/browser/crashreport.sjs', -] - with Files('mozapps/installer/windows/*'): BUG_COMPONENT = ('Toolkit', 'NSIS Installer') |