diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
| commit | 35c26c6c19e66fabcb230fb074e76e243df04d2b (patch) | |
| tree | 9cbdb0397c76a7477cd60c53347ab33d426f2019 /toolkit/moz.build | |
| parent | 8f35c37a9e82ea3e99780c1a001641227a00b6a9 (diff) | |
| download | UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.gz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.lz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.xz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.zip | |
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/moz.build')
| -rw-r--r-- | toolkit/moz.build | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/toolkit/moz.build b/toolkit/moz.build index c0f7dc214..9c5102a01 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -27,16 +27,15 @@ if CONFIG['MOZ_JETPACK']: DIRS += ['mozapps/extensions'] -if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': +if CONFIG['MOZ_UPDATER']: DIRS += ['mozapps/update'] - -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. - DIRS += [ - 'mozapps/update/common-standalone', - ] + if 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. + DIRS += [ + 'mozapps/update/common-standalone', + ] DIRS += ['xre'] @@ -46,5 +45,3 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': DIRS += ['system/osxproxy'] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': DIRS += ['system/windowsproxy'] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - DIRS += ['system/androidproxy'] |