Bug 1610571 - Don't register amContentHandler xpi for GeckoView. r=mixedpuppy

This also removes amWebAPI since we don't use it already.

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

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

toolkit/mozapps/extensions/components.conf

@@ -21,22 +21,26 @@ Classes = [
         'jsm': 'resource://gre/modules/addonManager.js',
         'constructor': 'amManager',
     },
-    {
-        'cid': '{7beb3ba8-6ec3-41b4-b67c-da89b8518922}',
-        'contract_ids': ['@mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall'],
-        'jsm': 'resource://gre/modules/amContentHandler.jsm',
-        'constructor': 'amContentHandler',
-    },
     {
         'cid': '{9df8ef2b-94da-45c9-ab9f-132eb55fddf1}',
         'contract_ids': ['@mozilla.org/addons/installtrigger;1'],
         'jsm': 'resource://gre/modules/amInstallTrigger.jsm',
         'constructor': 'InstallTrigger',
     },
-    {
-        'cid': '{8866d8e3-4ea5-48b7-a891-13ba0ac15235}',
-        'contract_ids': ['@mozilla.org/addon-web-api/manager;1'],
-        'jsm': 'resource://gre/modules/amWebAPI.jsm',
-        'constructor': 'WebAPI',
-    },
 ]
+
+if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':
+    Classes += [
+        {
+            'cid': '{7beb3ba8-6ec3-41b4-b67c-da89b8518922}',
+            'contract_ids': ['@mozilla.org/uriloader/content-handler;1?type=application/x-xpinstall'],
+            'jsm': 'resource://gre/modules/amContentHandler.jsm',
+            'constructor': 'amContentHandler',
+        },
+        {
+            'cid': '{8866d8e3-4ea5-48b7-a891-13ba0ac15235}',
+            'contract_ids': ['@mozilla.org/addon-web-api/manager;1'],
+            'jsm': 'resource://gre/modules/amWebAPI.jsm',
+            'constructor': 'WebAPI',
+        },
+    ]