Bug 1547331 - Don't initialize legacy telemetry in GeckoView. r=chutten,kmag

This changes the registration code so that categories are
still registered in the manifest (and thus not registered
in GeckoView), but the component is still always shipped.

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

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

browser/installer/package-manifest.in

@@ -184,6 +184,7 @@
 @RESPATH@/components/servicesComponents.manifest
 @RESPATH@/components/servicesSettings.manifest
 @RESPATH@/components/cryptoComponents.manifest
+@RESPATH@/components/TelemetryStartup.manifest
 
 @RESPATH@/components/Push.manifest
 

mobile/android/installer/package-manifest.in

@@ -130,6 +130,10 @@
 @BINPATH@/components/servicesComponents.manifest
 @BINPATH@/components/servicesSettings.manifest
 
+#ifndef MOZ_GECKOVIEW_JAR
+@BINPATH@/components/TelemetryStartup.manifest
+#endif
+
 #if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
 @BINPATH@/components/TestInterfaceJS.js
 @BINPATH@/components/TestInterfaceJS.manifest

toolkit/components/telemetry/TelemetryStartup.manifest

@@ -0,0 +1 @@
+category profile-after-change TelemetryStartup @mozilla.org/base/telemetry-startup;1 process=main

toolkit/components/telemetry/components.conf

@@ -10,7 +10,6 @@ Classes = [
         'contract_ids': ['@mozilla.org/base/telemetry-startup;1'],
         'jsm': 'resource://gre/modules/TelemetryStartup.jsm',
         'constructor': 'TelemetryStartup',
-        'categories': {'profile-after-change': 'TelemetryStartup'},
         'processes': ProcessSelector.MAIN_PROCESS_ONLY,
     },
 ]

toolkit/components/telemetry/moz.build

@@ -100,6 +100,10 @@ XPCOM_MANIFESTS += [
     'core/components.conf',
 ]
 
+EXTRA_COMPONENTS += [
+    'TelemetryStartup.manifest'
+]
+
 EXTRA_JS_MODULES += [
     'app/ClientID.jsm',
     'app/TelemetryArchive.jsm',