diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:56:02 +0200 |
| commit | d20ca24a070d547be3bce4d513ef151b6be5f955 (patch) | |
| tree | b0b56d41c3f41db217e8f894c0545a0217dbba4f /toolkit/toolkit.mozbuild | |
| parent | b2ca17a29814f6aaf043240cd1ec2f86ca989419 (diff) | |
| download | UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.gz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.lz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.tar.xz UXP-d20ca24a070d547be3bce4d513ef151b6be5f955.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', |