From a606410ba941d4d093ad02a1dde26eb75a7fd80a Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 29 Jan 2019 10:48:41 -0500
Subject: [TychoAM] Fix GMP* so that EME works in Basilisk

Also, keep WebExAM working for the moment
---
 toolkit/modules/moz.build | 2 --
 1 file changed, 2 deletions(-)

(limited to 'toolkit/modules/moz.build')

diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index e288d11c8..948d8d2c9 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -46,8 +46,6 @@ EXTRA_JS_MODULES += [
     'FinderIterator.jsm',
     'FormLikeFactory.jsm',
     'Geometry.jsm',
-    'GMPInstallManager.jsm',
-    'GMPUtils.jsm',
     'Http.jsm',
     'InlineSpellChecker.jsm',
     'InlineSpellCheckerContent.jsm',
-- 
cgit v1.2.3


From 43d44975b1f49df640916cca5f6a0b138696da3c Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 13 Feb 2019 19:11:37 +0100
Subject: Remove WebExtension support from the platform.

- Conditional code
- WE APIs
- WE toolkit theming
---
 toolkit/modules/moz.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'toolkit/modules/moz.build')

diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 948d8d2c9..e0acdb19e 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -103,11 +103,9 @@ EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 EXTRA_PP_JS_MODULES += [
     'NewTabUtils.jsm',
     'Troubleshoot.jsm',
+    'UpdateChannel.jsm',
 ]
 
-if not CONFIG['MOZ_WEBEXTENSIONS']:
-  EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
 
-- 
cgit v1.2.3