From 35c26c6c19e66fabcb230fb074e76e243df04d2b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 25 Feb 2020 19:45:39 -0500 Subject: Issue #1053 - Remove android support from toolkit Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm --- toolkit/toolkit.mozbuild | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'toolkit/toolkit.mozbuild') 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', -- cgit v1.2.3