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/toolkit.mozbuild | |
| 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/toolkit.mozbuild')
| -rw-r--r-- | toolkit/toolkit.mozbuild | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index fcc3eb556..230fef418 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -85,12 +85,6 @@ DIRS += [ '/xpfe/appshell' ] -# This needs to be built after the gfx/ directory -# to ensure all dependencies for skia (e.g. mozalloc, xpcom) -# have been built -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - DIRS += ['/other-licenses/skia-npapi'] - if CONFIG['MOZ_UNIVERSALCHARDET']: DIRS += ['/extensions/universalchardet'] @@ -143,7 +137,7 @@ DIRS += [ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: DIRS += ['/toolkit/system/gnome'] -if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android'): +if CONFIG['ENABLE_MARIONETTE']: DIRS += [ '/testing/firefox-ui', '/testing/marionette', |