diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
| commit | e25ad543952b5afc13181aaebef9c5951fc27be0 (patch) | |
| tree | 456a1359b3e5f810319edd423dd5cc5a1e22ada5 /toolkit/moz.build | |
| parent | 74533a843277c3687c749989ed1522354d1054d2 (diff) | |
| parent | 5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff) | |
| download | UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.gz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.lz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.xz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.zip | |
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'toolkit/moz.build')
| -rw-r--r-- | toolkit/moz.build | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/toolkit/moz.build b/toolkit/moz.build index 778f1c0de..158e760dc 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'): |