Bug 1255567 - Sign quitter extension for valgrind-test and pgo/profileserver, r=jgriffin

MozReview-Commit-ID: HtH8z4rBSMY

--HG--
extra : rebase_source : 90a1269a6dd166cc77080d86f902c19d0a6e162c

build/pgo/profileserver.py

@@ -49,7 +49,7 @@ if __name__ == '__main__':
       prefs[pref] = Preferences.cast(prefs[pref])
     profile = FirefoxProfile(profile=profilePath,
                              preferences=prefs,
-                             addons=[os.path.join(build.distdir, 'xpi-stage', 'quitter')],
+                             addons=[os.path.join(build.topsrcdir, 'tools', 'quitter', 'quitter@mozilla.org.xpi')],
                              locations=locations)
 
     env = os.environ.copy()

build/valgrind/mach_commands.py

@@ -73,7 +73,7 @@ class MachCommands(MachCommandBase):
             for pref in prefs:
                 prefs[pref] = Preferences.cast(prefs[pref])
 
-            quitter = os.path.join(self.distdir, 'xpi-stage', 'quitter')
+            quitter = os.path.join(self.topsrcdir, 'tools', 'quitter', 'quitter@mozilla.org.xpi')
 
             locations = ServerLocations()
             locations.add_host(host='127.0.0.1',

tools/quitter/install.rdf

@@ -5,16 +5,25 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>quitter@mozilla.org</em:id>
-    <em:version>2013.09.14</em:version>
+    <em:version>2016.03.10</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into,
          with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-#expand        <em:minVersion>__MOZILLA_VERSION_U__</em:minVersion>
-#expand        <em:maxVersion>__MOZILLA_VERSION_U__</em:maxVersion>
+        <!-- Firefox -->
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>45.0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <Description>
+        <!-- Fennec -->
+        <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
+        <em:minVersion>45.0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

tools/quitter/moz.build

@@ -15,10 +15,7 @@ JAR_MANIFESTS += ['jar.mn']
 USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
-FINAL_TARGET_PP_FILES += [
-    'install.rdf',
-]
-
 FINAL_TARGET_FILES += [
     'chrome.manifest',
+    'install.rdf',
 ]