Issue 1048 - Generate devbuild update manifests for Android

sitescripts/extensions/bin/updateUpdateManifests.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 12 matching lines @@
 """
 
 import os
 import re
 import subprocess
 from buildtools.packagerGecko import KNOWN_APPS
 from ConfigParser import SafeConfigParser
 from sitescripts.utils import get_config, get_template
 from sitescripts.extensions.utils import (
   Configuration, getDownloadLinks, getSafariCertificateID,
-  writeIEUpdateManifest, writeLibabpUpdateManifest)
+  writeIEUpdateManifest, writeAndroidUpdateManifest)
 from sitescripts.extensions.android import get_min_sdk_version
 
 def readMetadata(repo, version):
   """
   reads extension ID and compatibility information from metadata file in the
   extension's repository
   """
   if repo.type == 'android':
     command = ['hg', '-R', repo.repository, 'id', '-r', version, '-n']
     result = subprocess.check_output(command)
@@ skipping 55 matching lines @@
     manifestPath = get_config().get('extensions', '%sUpdateManifestPath' % repoType)
     if repoType == 'ie':
       writeIEUpdateManifest(manifestPath, extensions[repoType])
     else:
       # ABP for Android used to have its own update manifest format. We need to
       # generate both that and the new one in the libadblockplus format as long
       # as a significant amount of users is on an old version.
       if repoType == 'android':
         newManifestPath = get_config().get("extensions",
                                            "androidNewUpdateManifestPath")
-        updates = {}
-        for extension in extensions[repoType]:
-          updates[extension['basename']] = {
-            'version': extension['version'],
-            'url': extension['updateURL']
-          }
-        writeLibabpUpdateManifest(newManifestPath, updates)
+        writeAndroidUpdateManifest(newManifestPath, extensions[repoType])
       template = get_template(get_config().get('extensions', '%sUpdateManifest' % repoType))
       template.stream({'extensions': extensions[repoType]}).dump(manifestPath)
 
 def updateUpdateManifests():
   """
   updates all update manifests with the current versions
   """
 
   parser = SafeConfigParser()
   getDownloadLinks(parser)
   writeUpdateManifest(parser)
 
 if __name__ == "__main__":
   updateUpdateManifests()