Issue 6552 - Support arbitrary manifest values

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 83 matching lines @@
                 # ... = icon-19.png icon-38.png popup.html
                 popup = icons.pop()
                 icon = makeIcons(files, icons)
         else:
             # ... = icon-16.png icon-32.png icon-48.png
             icon = makeIcons(files, icons)
             popup = None
 
         templateData[opt] = {'icon': icon, 'popup': popup}
 
-    # Generate templatedataa which does not need special processing
-    arbitrary_manifest = metadata.as_json_object('manifest')
-    templateData.update(arbitrary_manifest)
-
     if metadata.has_option('general', 'icons'):
         templateData['icons'] = makeIcons(files,
                                           metadata.get('general', 'icons').split())
 
     if metadata.has_option('general', 'backgroundScripts'):
         templateData['backgroundScripts'] = metadata.get(
             'general', 'backgroundScripts').split()
         if params['devenv']:
             templateData['backgroundScripts'].append('devenvPoller__.js')
 
@@ skipping 13 matching lines @@
     if params['type'] == 'gecko':
         templateData['app_id'] = get_app_id(params['releaseBuild'], metadata)
 
     manifest = template.render(templateData)
 
     # Normalize JSON structure
     licenseComment = re.compile(r'/\*.*?\*/', re.S)
     data = json.loads(re.sub(licenseComment, '', manifest, 1))
     if '_dummy' in data:
         del data['_dummy']
+
+    metadata.serialize_section_if_present('manifest', data)
     manifest = json.dumps(data, sort_keys=True, indent=2)
 
     return manifest.encode('utf-8')
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
@@ skipping 238 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)