Bug 1620415 - Don't include GMP in GeckoView r=geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D65644

--HG--
extra : moz-landing-system : lando

toolkit/modules/moz.build

@@ -185,9 +185,6 @@ EXTRA_JS_MODULES += [
     'FirstStartup.jsm',
     'FormLikeFactory.jsm',
     'Geometry.jsm',
-    'GMPExtractorWorker.js',
-    'GMPInstallManager.jsm',
-    'GMPUtils.jsm',
     'HiddenFrame.jsm',
     'Http.jsm',
     'IgnoreLists.jsm',
@@ -251,6 +248,9 @@ EXTRA_PP_JS_MODULES += [
 
 if 'Android' != CONFIG['OS_TARGET']:
     EXTRA_JS_MODULES += [
+        'GMPExtractorWorker.js',
+        'GMPInstallManager.jsm',
+        'GMPUtils.jsm',
         'LightweightThemeConsumer.jsm',
     ]
 

toolkit/modules/tests/xpcshell/xpcshell.ini

@@ -18,6 +18,7 @@ skip-if = toolkit == 'android' || (os == 'mac' && os_version=='10.14') # osx: Bu
 skip-if = toolkit == 'android'
 [test_FinderIterator.js]
 [test_GMPInstallManager.js]
+skip-if = toolkit == 'android'
 [test_Http.js]
 [test_IgnoreList.js]
 [test_Integration.js]

toolkit/mozapps/extensions/extensions.manifest

@@ -5,6 +5,6 @@ category update-timer addonManager @mozilla.org/addons/integration;1,getService,
 #ifndef MOZ_THUNDERBIRD
 #ifndef MOZ_WIDGET_ANDROID
 category addon-provider-module PluginProvider resource://gre/modules/addons/PluginProvider.jsm
-#endif
 category addon-provider-module GMPProvider resource://gre/modules/addons/GMPProvider.jsm
 #endif
+#endif

toolkit/mozapps/extensions/internal/moz.build

@@ -9,7 +9,6 @@ EXTRA_JS_MODULES.addons += [
     'AddonSettings.jsm',
     'AddonUpdateChecker.jsm',
     'Content.js',
-    'GMPProvider.jsm',
     'ProductAddonChecker.jsm',
     'XPIDatabase.jsm',
     'XPIInstall.jsm',
@@ -18,6 +17,7 @@ EXTRA_JS_MODULES.addons += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     EXTRA_JS_MODULES.addons += [
+        'GMPProvider.jsm',
         'PluginProvider.jsm',
     ]